test/tools/launcher/I18NArgTest.java

*** 93,117 ****
          if (!tr.isOK()) {
              System.err.println(tr);
              throw new RuntimeException("test fails");
          }
  
!         // Test via JAVA_OPTIONS
! /*
          Map<String, String> env = new HashMap<>();
          String cmd = "-Dtest.src=" + TEST_SOURCES_DIR.getAbsolutePath() +
                  " -Dtest.classes=" + TEST_CLASSES_DIR.getAbsolutePath() +
                  " -cp " + TEST_CLASSES_DIR.getAbsolutePath() +
                  " I18NArgTest " + unicodeStr + " " + hexValue;
!         env.put("JAVA_OPTIONS", cmd);
          tr = doExec(env, javaCmd);
          System.out.println(tr.testOutput);
          if (!tr.isOK()) {
              System.err.println(tr);
              throw new RuntimeException("test fails");
          }
- */
      }
  
      static void testCharacters(String... args) {
          String input = args[0];
          String expected = args[1];
--- 93,115 ----
          if (!tr.isOK()) {
              System.err.println(tr);
              throw new RuntimeException("test fails");
          }
  
!         // Test via JDK_JAVA_OPTIONS
          Map<String, String> env = new HashMap<>();
          String cmd = "-Dtest.src=" + TEST_SOURCES_DIR.getAbsolutePath() +
                  " -Dtest.classes=" + TEST_CLASSES_DIR.getAbsolutePath() +
                  " -cp " + TEST_CLASSES_DIR.getAbsolutePath() +
                  " I18NArgTest " + unicodeStr + " " + hexValue;
!         env.put("JDK_JAVA_OPTIONS", cmd);
          tr = doExec(env, javaCmd);
          System.out.println(tr.testOutput);
          if (!tr.isOK()) {
              System.err.println(tr);
              throw new RuntimeException("test fails");
          }
      }
  
      static void testCharacters(String... args) {
          String input = args[0];
          String expected = args[1];