summaryrefslogtreecommitdiff
path: root/tests/scripts
diff options
context:
space:
mode:
authorSean Gillespie <segilles@microsoft.com>2017-06-02 10:17:53 -0700
committerGitHub <noreply@github.com>2017-06-02 10:17:53 -0700
commit392c4e10e4bbdb16d9e3a0d231433fdc15bca0fb (patch)
tree86795dcd573850521c391d0f8e7d279faa47472d /tests/scripts
parent65a0c4c2d276b44421ed31c7abcab0fb125cd606 (diff)
downloadcoreclr-392c4e10e4bbdb16d9e3a0d231433fdc15bca0fb.tar.gz
coreclr-392c4e10e4bbdb16d9e3a0d231433fdc15bca0fb.tar.bz2
coreclr-392c4e10e4bbdb16d9e3a0d231433fdc15bca0fb.zip
Return 0 on success from GC Reliability Framework scripts (#11990)
* Return 0 on success from GC Reliability Framework scripts * Don't save standard out, Jenkins already does this
Diffstat (limited to 'tests/scripts')
-rw-r--r--tests/scripts/run-gc-reliability-framework.cmd15
-rwxr-xr-xtests/scripts/run-gc-reliability-framework.sh16
2 files changed, 29 insertions, 2 deletions
diff --git a/tests/scripts/run-gc-reliability-framework.cmd b/tests/scripts/run-gc-reliability-framework.cmd
index f9a6ae277d..66be1d649d 100644
--- a/tests/scripts/run-gc-reliability-framework.cmd
+++ b/tests/scripts/run-gc-reliability-framework.cmd
@@ -6,5 +6,18 @@
set CORE_ROOT=%CD%\bin\tests\Windows_NT.%1.%2\Tests\Core_Root
set FRAMEWORK_DIR=%CD%\bin\tests\Windows_NT.%1.%2\GC\Stress\Framework\ReliabilityFramework
-powershell "%CORE_ROOT%\CoreRun.exe %FRAMEWORK_DIR%\ReliabilityFramework.exe %FRAMEWORK_DIR%\testmix_gc.config | tee stdout.txt"
+powershell "%CORE_ROOT%\CoreRun.exe %FRAMEWORK_DIR%\ReliabilityFramework.exe %FRAMEWORK_DIR%\testmix_gc.config"
+if %ERRORLEVEL% == 100 (
+ @rem The ReliabilityFramework returns 100 on success and 99 on failure
+ echo ReliabilityFramework successful
+ exit /b 0
+) else if %ERRORLEVEL% == 99 (
+ echo ReliabilityFramework test failed, some tests failed
+ exit /b 1
+) else (
+ @rem The ReliabilityFramework returns -1 when something is wrong with the
+ @rem run configuration. It should be obvious from standard out why this happened.
+ echo ReliabilityFramework returned a strange exit code %ERRORLEVEL%, perhaps some config is wrong?
+ exit /b 1
+)
diff --git a/tests/scripts/run-gc-reliability-framework.sh b/tests/scripts/run-gc-reliability-framework.sh
index d1c200ef02..d6b8f0385b 100755
--- a/tests/scripts/run-gc-reliability-framework.sh
+++ b/tests/scripts/run-gc-reliability-framework.sh
@@ -2,5 +2,19 @@
export CORE_ROOT=`pwd`/bin/tests/Windows_NT.$1.$2/Tests/coreoverlay
FRAMEWORK_DIR=`pwd`/bin/tests/Windows_NT.$1.$2/GC/Stress/Framework/ReliabilityFramework
-$CORE_ROOT/corerun $FRAMEWORK_DIR/ReliabilityFramework.exe $FRAMEWORK_DIR/testmix_gc.config | tee stdout.txt
+$CORE_ROOT/corerun $FRAMEWORK_DIR/ReliabilityFramework.exe $FRAMEWORK_DIR/testmix_gc.config
+EXIT_CODE=$?
+if [ $EXIT_CODE -eq 100 ]
+then
+ echo "ReliabilityFramework successful"
+ exit 0
+fi
+if [ $EXIT_CODE -eq 99 ]
+then
+ echo "ReliabilityFramework test failed, some tests failed"
+ exit 1
+fi
+
+echo "ReliabilityFramework returned a strange exit code $EXIT_CODE, perhaps some config is wrong?"
+exit 1