test/tools/launcher/ExecutionEnvironment.java

*** 87,100 ****
          LD_LIBRARY_PATH_64 + "=" + LD_LIBRARY_PATH_64_VALUE
      };
  
      static final File testJarFile = new File("EcoFriendly.jar");
  
-     static final String LIBJVM = TestHelper.isWindows
-             ? "jvm.dll"
-             : "libjvm" + (TestHelper.isMacOSX ? ".dylib" : ".so");
- 
      public ExecutionEnvironment() {
          createTestJar();
      }
  
      static void createTestJar() {
--- 87,96 ----
*** 138,149 ****
          for (String x : LD_PATH_STRINGS) {
              String pairs[] = x.split("=");
              env.put(pairs[0], pairs[1]);
          }
  
!         tr = doExec(env, javaCmd, haveServerVM ? "-server" : "-client",
!                     "-jar", testJarFile.getAbsolutePath());
  
          if (!tr.isNotZeroOutput()) {
              flagError(tr, "Error: No output at all. Did the test execute ?");
          }
  
--- 134,144 ----
          for (String x : LD_PATH_STRINGS) {
              String pairs[] = x.split("=");
              env.put(pairs[0], pairs[1]);
          }
  
!         tr = doExec(env, javaCmd, "-jar", testJarFile.getAbsolutePath());
  
          if (!tr.isNotZeroOutput()) {
              flagError(tr, "Error: No output at all. Did the test execute ?");
          }
  
*** 160,172 ****
       */
      @Test
      void testNoExec() {
          Map<String, String> env = new HashMap<>();
          env.put(JLDEBUG_KEY, "true");
!         TestResult tr = doExec(env, javaCmd,
!                                haveServerVM ? "-server" : "-client",
!                                "-version");
          if (tr.testOutput.contains(EXPECTED_MARKER)) {
              flagError(tr, "testNoExec: found  warning <" + EXPECTED_MARKER +
                      "> the process execing ?");
          }
      }
--- 155,165 ----
       */
      @Test
      void testNoExec() {
          Map<String, String> env = new HashMap<>();
          env.put(JLDEBUG_KEY, "true");
!         TestResult tr = doExec(env, javaCmd, "-version");
          if (tr.testOutput.contains(EXPECTED_MARKER)) {
              flagError(tr, "testNoExec: found  warning <" + EXPECTED_MARKER +
                      "> the process execing ?");
          }
      }
*** 191,202 ****
              for (String x : LD_PATH_STRINGS) {
                  String pairs[] = x.split("=");
                  env.put(pairs[0], pairs[1]);
              }
  
!             tr = doExec(env, javaCmd, haveServerVM ? "-server" : "-client",
!                         "-jar", testJarFile.getAbsolutePath());
              verifyJavaLibraryPathGeneric(tr);
          } else { // Solaris
              // no override
              env.clear();
              env.put(LD_LIBRARY_PATH, LD_LIBRARY_PATH_VALUE);
--- 184,194 ----
              for (String x : LD_PATH_STRINGS) {
                  String pairs[] = x.split("=");
                  env.put(pairs[0], pairs[1]);
              }
  
!             tr = doExec(env, javaCmd, "-jar", testJarFile.getAbsolutePath());
              verifyJavaLibraryPathGeneric(tr);
          } else { // Solaris
              // no override
              env.clear();
              env.put(LD_LIBRARY_PATH, LD_LIBRARY_PATH_VALUE);
*** 238,249 ****
                      " java.library.path contains " + LD_LIBRARY_PATH_VALUE);
          }
      }
  
      /*
!      * ensures we have indeed exec'ed the correct vm of choice, all VMs support
!      * -server, however 32-bit VMs support -client and -server.
       */
      @Test
      void testVmSelection() {
  
          TestResult tr = null;
--- 230,240 ----
                      " java.library.path contains " + LD_LIBRARY_PATH_VALUE);
          }
      }
  
      /*
!      * ensures we have indeed exec'ed the correct vm of choice if it exists
       */
      @Test
      void testVmSelection() {
  
          TestResult tr = null;