Mercurial > people > rkennke > jdk9-shenandoah-final > nashorn
changeset 1342:6eca661ddf79
8130306: enable running Nashorn test on Windows
Summary: fix executable name (add .exe suffix)
Reviewed-by: hannesw, sundar
author | mhaupt |
---|---|
date | Thu, 02 Jul 2015 11:09:20 +0200 |
parents | 1172aca37bba |
children | becb3bb6a422 |
files | test/script/nosecurity/JDK-8050964.js |
diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/test/script/nosecurity/JDK-8050964.js Thu Jul 02 10:55:35 2015 +0200 +++ b/test/script/nosecurity/JDK-8050964.js Thu Jul 02 11:09:20 2015 +0200 @@ -46,10 +46,14 @@ 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