Fri, 14 Jul 2017 14:30:06 -0700
Merge
sundar@1525 | 1 | /* |
sdama@1838 | 2 | * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. |
sundar@1525 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
sundar@1525 | 4 | * |
sundar@1525 | 5 | * This code is free software; you can redistribute it and/or modify it |
sundar@1525 | 6 | * under the terms of the GNU General Public License version 2 only, as |
sundar@1525 | 7 | * published by the Free Software Foundation. |
sundar@1525 | 8 | * |
sundar@1525 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
sundar@1525 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
sundar@1525 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
sundar@1525 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
sundar@1525 | 13 | * accompanied this code). |
sundar@1525 | 14 | * |
sundar@1525 | 15 | * You should have received a copy of the GNU General Public License version |
sundar@1525 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
sundar@1525 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
sundar@1525 | 18 | * |
sundar@1525 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
sundar@1525 | 20 | * or visit www.oracle.com if you need additional information or have any |
sundar@1525 | 21 | * questions. |
sundar@1525 | 22 | */ |
sundar@1525 | 23 | |
sundar@1525 | 24 | /** |
sundar@1525 | 25 | * JDK-8087292: nashorn should have a "fail-fast" option for scripting, analog to bash "set -e" |
sundar@1525 | 26 | * |
sundar@1525 | 27 | * @test |
sundar@1525 | 28 | * @option -scripting |
sundar@1525 | 29 | * @run |
sundar@1525 | 30 | */ |
sundar@1525 | 31 | |
sdama@1838 | 32 | load(__DIR__ + "JDK-util.js") |
sdama@1838 | 33 | |
sdama@1838 | 34 | var jHomePath = System.getenv("JAVA_HOME") |
sdama@1838 | 35 | var jLauncher = "${jHomePath}/bin/java" |
sdama@1838 | 36 | var altjLauncher = which('java') |
sdama@1838 | 37 | |
sdama@1838 | 38 | if (windows) { |
sdama@1838 | 39 | if(winCyg) { |
sdama@1838 | 40 | jLauncher = "${jHomePath}" + "/bin/java.exe" |
sdama@1838 | 41 | jLauncher = cygpath(jLauncher,outPath.windows) |
sdama@1838 | 42 | } |
sdama@1838 | 43 | else { |
sdama@1838 | 44 | jLauncher = "${jHomePath}" + "\\bin\\java.exe" |
sdama@1838 | 45 | altjLauncher = which('java.exe') |
sdama@1838 | 46 | altjLauncher = cygpath(altjLauncher,outPath.windows) |
sdama@1838 | 47 | } |
sdama@1838 | 48 | } |
sdama@1838 | 49 | |
sdama@1838 | 50 | function exists(f) { |
sdama@1838 | 51 | return Files.exists(Paths.get(f)) |
sdama@1838 | 52 | } |
sdama@1838 | 53 | |
sdama@1838 | 54 | var javaLauncher = exists(jLauncher) ? jLauncher : altjLauncher |
sdama@1838 | 55 | |
sdama@1838 | 56 | |
sdama@1838 | 57 | if (!exists(javaLauncher)) { |
sdama@1838 | 58 | throw "no java launcher found; tried ${jLauncher} and ${altjLauncher}" |
sdama@1838 | 59 | } |
sdama@1838 | 60 | |
sundar@1525 | 61 | function tryExec() { |
sundar@1525 | 62 | try { |
sdama@1838 | 63 | $EXEC("${javaLauncher}") |
sundar@1525 | 64 | } catch (e) { |
sdama@1838 | 65 | print(e) |
sundar@1525 | 66 | } |
sundar@1525 | 67 | |
sundar@1525 | 68 | // make sure we got non-zero ("failure") exit code! |
sundar@1525 | 69 | if ($EXIT == 0) { |
sdama@1838 | 70 | print("Error: expected $EXIT code to be non-zero") |
sundar@1525 | 71 | } |
sundar@1525 | 72 | } |
sdama@1838 | 73 | //convert windows paths to cygwin |
sdama@1838 | 74 | if (windows) |
sdama@1838 | 75 | javaLauncher = (winCyg) ? cygpath(javaLauncher,outPath.mixed).trim() : cygpath(javaLauncher,outPath.windows).trim() |
sundar@1525 | 76 | |
sundar@1525 | 77 | // no exception now! |
sdama@1838 | 78 | tryExec() |
sundar@1525 | 79 | |
sundar@1525 | 80 | // turn on error with non-zero exit code |
sdama@1838 | 81 | $EXEC.throwOnError = true |
sdama@1838 | 82 | tryExec() |
sundar@1525 | 83 | |
sundar@1525 | 84 | // no exception after this |
sdama@1838 | 85 | $EXEC.throwOnError = false |
sdama@1838 | 86 | tryExec() |