diff options
Diffstat (limited to 'tests/src/CLRTest.Execute.Bash.targets')
-rw-r--r-- | tests/src/CLRTest.Execute.Bash.targets | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/src/CLRTest.Execute.Bash.targets b/tests/src/CLRTest.Execute.Bash.targets index 5560447363..6d0afc4c9d 100644 --- a/tests/src/CLRTest.Execute.Bash.targets +++ b/tests/src/CLRTest.Execute.Bash.targets @@ -69,9 +69,7 @@ WARNING: When setting properties based on their current state (for example: <Message Text="Project depends on $(_CLRTestToRunFileFullPath)." Condition="'$(_CLRTestNeedsProjectToRun)' == 'True'" /> <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> + <GCBashScriptExitCode>0</GCBashScriptExitCode> <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(GCStressIncompatible)' == 'true'"><![CDATA[ $(BashCLRTestEnvironmentCompatibilityCheck) @@ -103,6 +101,11 @@ then exit $(GCBashScriptExitCode) fi ]]></BashCLRTestEnvironmentCompatibilityCheck> + <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(TestUnsupportedOutsideWindows)' == 'true'"><![CDATA[ +$(BashCLRTestEnvironmentCompatibilityCheck) +echo SKIPPING EXECUTION BECAUSE test is unsupported outside Windows. +exit $(GCBashScriptExitCode) + ]]></BashCLRTestEnvironmentCompatibilityCheck> <BashCLRTestExitCodePrep Condition="$(_CLRTestNeedsToRun)"> <![CDATA[ @@ -275,8 +278,8 @@ $(BashLinkerTestCleanupCmds) $(BashCLRTestLaunchCmds) echo export CDPATH="$%28dirname "$0")" export CDPATH="$%28dirname "$0")" -echo /bin/sh -c $(InputAssemblyName) -/bin/sh -c $(InputAssemblyName) +echo /bin/sh $(InputAssemblyName) +/bin/sh $(InputAssemblyName) CLRTestExitCode=$? CLRTestExpectedExitCode=0 ]]></BashCLRTestLaunchCmds> |