summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-12-12 13:58:29 -0800
committerPaul Phillips <paulp@improving.org>2011-12-12 13:58:29 -0800
commit278a225d989d30d9913dd923e13e55bfe437049e (patch)
tree979d3c870560df7f4e21c2748344b67c61c9e025 /test
parente8efc9a0337a3fc6ab5f8a0756cdc28f44f176a1 (diff)
parent1dec43c5ab4ab15ad8f13d4d93b404376f1aa47b (diff)
downloadscala-278a225d989d30d9913dd923e13e55bfe437049e.tar.gz
scala-278a225d989d30d9913dd923e13e55bfe437049e.tar.bz2
scala-278a225d989d30d9913dd923e13e55bfe437049e.zip
Merge remote-tracking branch 'repo/develop'
Diffstat (limited to 'test')
-rwxr-xr-xtest/files/jvm/mkLibNatives.bat2
-rwxr-xr-xtest/partest.bat1
2 files changed, 2 insertions, 1 deletions
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%