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

8215000: tools/launcher/JliLaunchTest.java fails on Windows

Browse Source 
Reviewed-by: bchristi, mchung
This commit is contained in:
Henry Jen 2018-12-12 11:45:10 -08:00
parent 85857dfe80
commit 0e86ce5715
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/jdk/tools/launcher/JliLaunchTest.java
View File

@ -49,10 +49,12 @@ public class JliLaunchTest {
Map<String, String> env = pb.environment(); Map<String, String> env = pb.environment();
if (Platform.isWindows()) { if (Platform.isWindows()) {
// The DLL should be in JDK/bin // The DLL should be in JDK/bin
String libdir = Paths.get(Utils.TEST_JDK).resolve("bin").toAbsolutePath().toString();
env.compute("PATH", (k, v) -> (v == null) ? libdir : libdir + ";" + v);
} else { } else {
String libdir = Paths.get(Utils.TEST_JDK).resolve("lib").toAbsolutePath().toString(); String libdir = Paths.get(Utils.TEST_JDK).resolve("lib").toAbsolutePath().toString();
String LD_LIBRARY_PATH = Platform.isOSX() ? "DYLD_LIBRARY_PATH" : "LD_LIBRARY_PATH"; String LD_LIBRARY_PATH = Platform.isOSX() ? "DYLD_LIBRARY_PATH" : "LD_LIBRARY_PATH";
env.compute(LD_LIBRARY_PATH, (k, v) -> (k == null) ? libdir : v + ":" + libdir); env.compute(LD_LIBRARY_PATH, (k, v) -> (v == null) ? libdir : libdir + ":" + v);
} }
OutputAnalyzer outputf = new OutputAnalyzer(pb.start()); OutputAnalyzer outputf = new OutputAnalyzer(pb.start());