From 18a725ff0c27147fd6348bb2a8abb1d102ced5dd Mon Sep 17 00:00:00 2001 From: Srinivas Dama Date: Thu, 1 Dec 2016 08:12:06 -0800 Subject: [PATCH] 8130351: JDK-8130127.js fails under cygwin: cygwin path pased to Java Jjs uses jline which expects newline character to terminate interactive input Reviewed-by: sundar, jlaskey --- .../test/script/currently-failing/JDK-8130127.js.EXPECTED | 6 ------ .../{currently-failing => nosecurity}/JDK-8130127.js | 4 ++-- nashorn/test/script/nosecurity/JDK-8130127.js.EXPECTED | 7 +++++++ 3 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 nashorn/test/script/currently-failing/JDK-8130127.js.EXPECTED rename nashorn/test/script/{currently-failing => nosecurity}/JDK-8130127.js (93%) create mode 100644 nashorn/test/script/nosecurity/JDK-8130127.js.EXPECTED diff --git a/nashorn/test/script/currently-failing/JDK-8130127.js.EXPECTED b/nashorn/test/script/currently-failing/JDK-8130127.js.EXPECTED deleted file mode 100644 index 036205209c5..00000000000 --- a/nashorn/test/script/currently-failing/JDK-8130127.js.EXPECTED +++ /dev/null @@ -1,6 +0,0 @@ - - - - -hello - diff --git a/nashorn/test/script/currently-failing/JDK-8130127.js b/nashorn/test/script/nosecurity/JDK-8130127.js similarity index 93% rename from nashorn/test/script/currently-failing/JDK-8130127.js rename to nashorn/test/script/nosecurity/JDK-8130127.js index 55b56d1730c..7eb815f6f84 100644 --- a/nashorn/test/script/currently-failing/JDK-8130127.js +++ b/nashorn/test/script/nosecurity/JDK-8130127.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -51,5 +51,5 @@ print($EXEC(jjsCmd, null)) print($EXEC(jjsCmd, undefined)) print($EXEC(jjsCmd, "")) -print($EXEC(jjs, "print('hello')")) +print($EXEC(jjs, "print('hello')\n")) diff --git a/nashorn/test/script/nosecurity/JDK-8130127.js.EXPECTED b/nashorn/test/script/nosecurity/JDK-8130127.js.EXPECTED new file mode 100644 index 00000000000..b2debcf9c41 --- /dev/null +++ b/nashorn/test/script/nosecurity/JDK-8130127.js.EXPECTED @@ -0,0 +1,7 @@ + + + + +jjs> print('hello') +hello +jjs>