mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-20 11:04:34 +02:00
8062638: RuntimeException when run command from js with -scripting on Cygwin
Reviewed-by: hannesw, lagergren
This commit is contained in:
parent
99895e4249
commit
42c6853ed1
2 changed files with 2 additions and 1 deletions
|
@ -50,6 +50,7 @@ var javahome = System.getProperty("java.home");
|
||||||
var jdepsPath = javahome + "/../bin/jdeps".replaceAll(/\//g, File.separater);
|
var jdepsPath = javahome + "/../bin/jdeps".replaceAll(/\//g, File.separater);
|
||||||
|
|
||||||
// run jdep on nashorn.jar - only summary but print profile info
|
// run jdep on nashorn.jar - only summary but print profile info
|
||||||
|
$ENV.PWD=System.getProperty("user.dir") // to avoid RE on Cygwin
|
||||||
`${jdepsPath} -s -P ${nashornJar.absolutePath}`
|
`${jdepsPath} -s -P ${nashornJar.absolutePath}`
|
||||||
|
|
||||||
// check for "(compact1)" in output from jdep tool
|
// check for "(compact1)" in output from jdep tool
|
||||||
|
|
|
@ -49,7 +49,7 @@ var nashornJarDir = nashornJar.parentFile.absolutePath;
|
||||||
var jjsCmd = javahome + "/../bin/jjs";
|
var jjsCmd = javahome + "/../bin/jjs";
|
||||||
jjsCmd += " -J-Djava.ext.dirs=" + nashornJarDir;
|
jjsCmd += " -J-Djava.ext.dirs=" + nashornJarDir;
|
||||||
jjsCmd = jjsCmd.toString().replaceAll(/\//g, File.separater);
|
jjsCmd = jjsCmd.toString().replaceAll(/\//g, File.separater);
|
||||||
|
$ENV.PWD=System.getProperty("user.dir") // to avoid RE on Cygwin
|
||||||
$EXEC(jjsCmd, "var x = Object.create(null);\nx;\nprint('PASSED');\nexit(0)");
|
$EXEC(jjsCmd, "var x = Object.create(null);\nx;\nprint('PASSED');\nexit(0)");
|
||||||
|
|
||||||
// $ERR has all interactions including prompts! Just check for error substring.
|
// $ERR has all interactions including prompts! Just check for error substring.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue