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 ----
*** 190,200 ****
                  env.put(pairs[0], pairs[1]);
              }
  
              tr = doExec(env, javaCmd, "-jar", testJarFile.getAbsolutePath());
              verifyJavaLibraryPathGeneric(tr);
!         } else {
              // no override
              env.clear();
              env.put(LD_LIBRARY_PATH, LD_LIBRARY_PATH_VALUE);
              tr = doExec(env, javaCmd, "-jar", testJarFile.getAbsolutePath());
              verifyJavaLibraryPathGeneric(tr);
--- 186,196 ----
                  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);
              tr = doExec(env, javaCmd, "-jar", testJarFile.getAbsolutePath());
              verifyJavaLibraryPathGeneric(tr);
*** 234,262 ****
                      " 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;
  
!         if (is32Bit) {
              tr = doExec(javaCmd, "-client", "-version");
              if (!tr.matches(".*Client VM.*")) {
                  flagError(tr, "the expected vm -client did not launch");
              }
          }
          tr = doExec(javaCmd, "-server", "-version");
          if (!tr.matches(".*Server VM.*")) {
              flagError(tr, "the expected vm -server did not launch");
          }
      }
  
      /*
       * checks to see there is no extra libjvm.so than needed
       */
      @Test
--- 230,259 ----
                      " 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;
  
!         if (haveClientVM) {
              tr = doExec(javaCmd, "-client", "-version");
              if (!tr.matches(".*Client VM.*")) {
                  flagError(tr, "the expected vm -client did not launch");
              }
          }
+         if (haveServerVM) {
              tr = doExec(javaCmd, "-server", "-version");
              if (!tr.matches(".*Server VM.*")) {
                  flagError(tr, "the expected vm -server did not launch");
              }
          }
+     }
  
      /*
       * checks to see there is no extra libjvm.so than needed
       */
      @Test