summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBruce Forstall <brucefo@microsoft.com>2019-01-04 14:14:47 -0800
committerGitHub <noreply@github.com>2019-01-04 14:14:47 -0800
commit0234d6bcfe3c7cf98ba6dbd9d23cdbdcdd0d4a04 (patch)
tree5616383d4c50ce42db894ead63fdaf15d0495223 /tests
parent4e82a5801bd804bff0bf6294d7135bbb63df92f6 (diff)
parent118383661a30bfad6f6c45f2cae034ea05ec3e61 (diff)
downloadcoreclr-0234d6bcfe3c7cf98ba6dbd9d23cdbdcdd0d4a04.tar.gz
coreclr-0234d6bcfe3c7cf98ba6dbd9d23cdbdcdd0d4a04.tar.bz2
coreclr-0234d6bcfe3c7cf98ba6dbd9d23cdbdcdd0d4a04.zip
Merge pull request #21806 from BruceForstall/CheckTestEnvCall
Check result of call to TestEnv script
Diffstat (limited to 'tests')
-rw-r--r--tests/src/CLRTest.Execute.Batch.targets9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/src/CLRTest.Execute.Batch.targets b/tests/src/CLRTest.Execute.Batch.targets
index 49414dfd0a..f6fb42ebff 100644
--- a/tests/src/CLRTest.Execute.Batch.targets
+++ b/tests/src/CLRTest.Execute.Batch.targets
@@ -382,7 +382,14 @@ $(BatchCLRTestArgPrep)
$(BatchCLRTestExitCodePrep)
REM The __TestEnv variable may be used to specify something to run before the test.
-IF NOT "%__TestEnv%"=="" call %__TestEnv%
+IF NOT "%__TestEnv%"=="" (
+ call %__TestEnv%
+ IF NOT "!ERRORLEVEL!"=="0" (
+ ECHO CALLING __TestEnv SCRIPT FAILED
+ popd
+ Exit /b 1
+ )
+)
REM Environment Variables
$(BatchEnvironmentVariables)