From d718a7c7f31afee174958f63d23ede87394a7a4a Mon Sep 17 00:00:00 2001 From: Eugene Burmako Date: Fri, 9 Dec 2011 22:33:01 +0100 Subject: Batch files no longer swallow exit codes Usually scripts like scala.bat and scalac.bat correctly propagate exit codes from underlying Java invocations. However, if you run these scripts as follows: "cmd /c scala ...", then errorlevel gets swallowed. This simple patch fixes the aforementioned problem. Fixes SI-5295, no review. --- src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 1 + test/files/jvm/mkLibNatives.bat | 2 +- test/partest.bat | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index c59d46683e..9f1fbc4524 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -86,3 +86,4 @@ goto :eof :end @@endlocal +exit /b %errorlevel% diff --git a/test/files/jvm/mkLibNatives.bat b/test/files/jvm/mkLibNatives.bat index e11b6ee21c..2f99f7aab5 100755 --- a/test/files/jvm/mkLibNatives.bat +++ b/test/files/jvm/mkLibNatives.bat @@ -67,4 +67,4 @@ goto end :end if "%OS%"=="Windows_NT" @endlocal - +exit /b %errorlevel% diff --git a/test/partest.bat b/test/partest.bat index 0b3f5fbf33..4c97a53122 100755 --- a/test/partest.bat +++ b/test/partest.bat @@ -101,3 +101,4 @@ goto end :end if "%OS%"=="Windows_NT" @endlocal +exit /b %errorlevel% -- cgit v1.2.3