stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8202559: Tests which start VM using JNI start failing after compile upgrade to VC 2017

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Igor Ignatyev 2018-06-18 16:58:16 -07:00
parent fc6e1757da
commit 6e38484942
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/hotspot/jtreg/vmTestbase/ExecDriver.java
View File

@ -102,22 +102,29 @@ public class ExecDriver {
// 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()
.toString();
value += File.pathSeparator;
value += dir.resolve("bin")
.toAbsolutePath()
.toString();
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));