# HG changeset patch # User iignatyev # Date 1529360615 25200 # Mon Jun 18 15:23:35 2018 -0700 # Node ID f229be8d975c3a934c2eff08d4b719f6b37f4527 # Parent 0f93a75b9213f895c12f0f231a7dba7a9ca7780a [mq]: 8202559 diff --git a/test/hotspot/jtreg/vmTestbase/ExecDriver.java b/test/hotspot/jtreg/vmTestbase/ExecDriver.java --- a/test/hotspot/jtreg/vmTestbase/ExecDriver.java +++ b/test/hotspot/jtreg/vmTestbase/ExecDriver.java @@ -102,22 +102,27 @@ // adding jvm.so to library path if (launcher) { Path dir = Paths.get(Utils.TEST_JDK); + String value; String name; if (Platform.isWindows()) { - dir = dir.resolve("bin") - .resolve(variant()) - .toAbsolutePath(); + value = dir.resolve("bin") + .resolve(variant()) + .toAbsolutePath(); + value += File.pathSeparator; + value += dir.resolve("bin") + .toAbsolutePath(); name = "PATH"; } else { - dir = dir.resolve("lib") - .resolve(variant()) - .toAbsolutePath(); + value = dir.resolve("lib") + .resolve(variant()) + .toAbsolutePath() + .toString(); name = Platform.isOSX() ? "DYLD_LIBRARY_PATH" : "LD_LIBRARY_PATH"; } System.out.println(" with " + name + " = " + pb.environment() - .merge(name, dir.toString(), (x, y) -> y + File.pathSeparator + x)); + .merge(name, value, (x, y) -> y + File.pathSeparator + x)); System.out.println(" with CLASSPATH = " + pb.environment() .put("CLASSPATH", Utils.TEST_CLASS_PATH));