test/tools/jar/modularJar/Basic.java

*** 829,844 ****
      static Result java(Path modulePath, String entryPoint, String... args) {
          String java = getJDKTool("java");
  
          List<String> commands = new ArrayList<>();
          commands.add(java);
!         if (!VM_OPTIONS.isEmpty()) {
!             commands.addAll(Arrays.asList(VM_OPTIONS.split("\\s+", -1)));
!         }
!         if (!JAVA_OPTIONS.isEmpty()) {
!             commands.addAll(Arrays.asList(JAVA_OPTIONS.split("\\s+", -1)));
!         }
          Stream.of(args).forEach(x -> commands.add(x));
          commands.add("-mp");
          commands.add(modulePath.toString());
          commands.add("-m");
          commands.add(entryPoint);
--- 829,845 ----
      static Result java(Path modulePath, String entryPoint, String... args) {
          String java = getJDKTool("java");
  
          List<String> commands = new ArrayList<>();
          commands.add(java);
!         //temporarily commenting out options for 8158855
!         //if (!VM_OPTIONS.isEmpty()) {
!         //    commands.addAll(Arrays.asList(VM_OPTIONS.split("\\s+", -1)));
!         //}
!         //if (!JAVA_OPTIONS.isEmpty()) {
!         //    commands.addAll(Arrays.asList(JAVA_OPTIONS.split("\\s+", -1)));
!         //}
          Stream.of(args).forEach(x -> commands.add(x));
          commands.add("-mp");
          commands.add(modulePath.toString());
          commands.add("-m");
          commands.add(entryPoint);