diff -r bf414874c28f test/hotspot/jtreg/vmTestbase/ExecDriver.java --- a/test/hotspot/jtreg/vmTestbase/ExecDriver.java Mon Jun 18 09:48:22 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/ExecDriver.java Mon Jun 18 21:25:17 2018 +0200 @@ -101,23 +101,25 @@ ProcessBuilder pb = new ProcessBuilder(args); // adding jvm.so to library path if (launcher) { - Path dir = Paths.get(Utils.TEST_JDK); + Path testJdkDir = Paths.get(Utils.TEST_JDK); String name; if (Platform.isWindows()) { - dir = dir.resolve("bin") - .resolve(variant()) - .toAbsolutePath(); + Path binDir = testJdkDir.resolve("bin").toAbsolutePath(); + Path variantDir = binDir.resolve(variant()).toAbsolutePath(); name = "PATH"; + pb.environment().merge(name, + variantDir + File.pathSeparator + binDir, + (x, y) -> y + File.pathSeparator + x); } else { - dir = dir.resolve("lib") + Path libDir = testJdkDir.resolve("lib") .resolve(variant()) .toAbsolutePath(); name = Platform.isOSX() ? "DYLD_LIBRARY_PATH" : "LD_LIBRARY_PATH"; + pb.environment().merge(name, libDir.toString(), + (x, y) -> y + File.pathSeparator + x); } - System.out.println(" with " + name + " = " + - pb.environment() - .merge(name, dir.toString(), (x, y) -> y + File.pathSeparator + x)); + System.out.println(" with " + name + " = " + pb.environment()); System.out.println(" with CLASSPATH = " + pb.environment() .put("CLASSPATH", Utils.TEST_CLASS_PATH));