infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-31 13:15:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

8130306: enable running Nashorn test on Windows

Browse Source 
Fix executable name (add .exe suffix)

Reviewed-by: hannesw, sundar
This commit is contained in:
Michael Haupt 2015-07-02 11:09:20 +02:00
parent 2a2f2f3300
commit 6980a8e4cc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nashorn/test/script/nosecurity/JDK-8050964.js
View File

@ -46,10 +46,14 @@ if (! nashornJar.isAbsolute()) {
nashornJar = new File(".", nashornJar);
}
var os = System.getProperty("os.name"),
win = os.startsWith("Windows"),
jdepsName = "jdeps" + (win ? ".exe" : "");
var javahome = System.getProperty("java.home");
var jdepsPath = javahome + "/../bin/jdeps".replace(/\//g, File.separator);
var jdepsPath = javahome + "/../bin/".replace(/\//g, File.separator) + jdepsName;
if (! new File(jdepsPath).isFile()) {
jdepsPath = javahome + "/bin/jdeps".replace(/\//g, File.separator);
jdepsPath = javahome + "/bin/".replace(/\//g, File.separator) + jdepsName;
}
// run jdep on nashorn.jar - only summary but print profile info