diff options
| author | wtgodbe <wigodbe@microsoft.com> | 2017-02-14 14:49:06 -0800 |
|---|---|---|
| committer | wtgodbe <wigodbe@microsoft.com> | 2017-02-14 15:29:50 -0800 |
| commit | 27258e64ebe842545a9fbcd9a06ce7e7fb81d86a (patch) | |
| tree | ad72724497cf31efa8be08ba2ad0f3bb441d61b0 /tests | |
| parent | cb8074ab5568044be64f158c97dccacfea8eb62a (diff) | |
| download | coreclr-27258e64ebe842545a9fbcd9a06ce7e7fb81d86a.tar.gz coreclr-27258e64ebe842545a9fbcd9a06ce7e7fb81d86a.tar.bz2 coreclr-27258e64ebe842545a9fbcd9a06ce7e7fb81d86a.zip | |
Return exit code 0 for long-running/GCSimulator tests in Helix
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/CLRTest.Execute.Bash.targets | 12 | ||||
| -rw-r--r-- | tests/src/CLRTest.GC.targets | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/tests/src/CLRTest.Execute.Bash.targets b/tests/src/CLRTest.Execute.Bash.targets index 04ab5fe2df..f17973a0f1 100644 --- a/tests/src/CLRTest.Execute.Bash.targets +++ b/tests/src/CLRTest.Execute.Bash.targets @@ -103,13 +103,17 @@ fi <Message Text="Project depends on $(_CLRTestToRunFileFullPath)." Condition="'$(_CLRTestNeedsProjectToRun)' == 'True'" /> - <PropertyGroup> + <PropertyGroup> + <!-- An exit code of 2 indicates "Skipped" for regular non-windows runs, but "Failed" in Helix --> + <GCBashScriptExitCode Condition="'$(BuildTestsAgainstPackages)' != 'true'">2</GCBashScriptExitCode> + <GCBashScriptExitCode Condition="'$(BuildTestsAgainstPackages)' == 'true'">0</GCBashScriptExitCode> + <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(GCStressIncompatible)' == 'true'"><![CDATA[ $(BashCLRTestEnvironmentCompatibilityCheck) if [ ! -z "$COMPlus_GCStress" ] then echo SKIPPING EXECUTION BECAUSE COMPlus_GCStress IS SET - exit 2 + exit $(GCBashScriptExitCode) fi ]]></BashCLRTestEnvironmentCompatibilityCheck> <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true'"><![CDATA[ @@ -117,7 +121,7 @@ $(BashCLRTestEnvironmentCompatibilityCheck) if [ \( ! -z "$COMPlus_JitStress" \) -o \( ! -z "$COMPlus_JitStressRegs" \) -o \( ! -z "$COMPlus_JITMinOpts" \) ] then echo "SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts) IS SET" - exit 2 + exit $(GCBashScriptExitCode) fi ]]></BashCLRTestEnvironmentCompatibilityCheck> <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(HeapVerifyIncompatible)' == 'true'"><![CDATA[ @@ -125,7 +129,7 @@ $(BashCLRTestEnvironmentCompatibilityCheck) if [ ! -z "$COMPlus_HeapVerify" ] then echo SKIPPING EXECUTION BECAUSE COMPlus_HeapVerify IS SET - exit 2 + exit $(GCBashScriptExitCode) fi ]]></BashCLRTestEnvironmentCompatibilityCheck> diff --git a/tests/src/CLRTest.GC.targets b/tests/src/CLRTest.GC.targets index b102a06b2b..f959aaf6e0 100644 --- a/tests/src/CLRTest.GC.targets +++ b/tests/src/CLRTest.GC.targets @@ -18,12 +18,16 @@ WARNING: When setting properties based on their current state (for example: --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> + <!-- An exit code of 2 indicates "Skipped" for regular non-windows runs, but "Failed" in Helix --> + <GCBashScriptExitCode Condition="'$(BuildTestsAgainstPackages)' != 'true'">2</GCBashScriptExitCode> + <GCBashScriptExitCode Condition="'$(BuildTestsAgainstPackages)' == 'true'">0</GCBashScriptExitCode> + <GCLongGCTestBashScript Condition="'$(IsLongRunningGCTest)' != 'true'"><![CDATA[ # Long GC script if [ ! -z $RunningLongGCTests ] then echo "Skipping execution because this is not a long-running GC test" - exit 2 + exit $(GCBashScriptExitCode) fi ]]></GCLongGCTestBashScript> <GCLongGCTestBashScript Condition="'$(IsLongRunningGCTest)' == 'true'"><![CDATA[ @@ -31,7 +35,7 @@ fi if [ -z $RunningLongGCTests ] then echo "Skipping execution because long-running GC tests are not enabled" - exit 2 + exit $(GCBashScriptExitCode) fi ]]></GCLongGCTestBashScript> @@ -41,7 +45,7 @@ fi if [ ! -z $RunningGCSimulatorTests ] then echo "Skipping execution because this is not a GCSimulator test" - exit 2 + exit $(GCBashScriptExitCode) fi ]]></GCSimulatorTestBashScript> <GCSimulatorTestBashScript Condition="'$(IsGCSimulatorTest)' == 'true'"><![CDATA[ @@ -49,7 +53,7 @@ fi if [ -z $RunningGCSimulatorTests ] then echo "Skipping execution because GCSimulator tests are not enabled" - exit 2 + exit $(GCBashScriptExitCode) fi ]]></GCSimulatorTestBashScript> |