diff options
author | Pat Gavlin <pgavlin@gmail.com> | 2017-05-16 17:28:20 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-16 17:28:20 -0700 |
commit | 8a24a64e018de999a07ea45b408fd3a3ca672ba8 (patch) | |
tree | 4cc183acd1cd16c6440e5edb45276bf3de7930d2 /tests | |
parent | 40b87c9810c31fb6ab471a44b5735408269ce6ba (diff) | |
download | coreclr-8a24a64e018de999a07ea45b408fd3a3ca672ba8.tar.gz coreclr-8a24a64e018de999a07ea45b408fd3a3ca672ba8.tar.bz2 coreclr-8a24a64e018de999a07ea45b408fd3a3ca672ba8.zip |
Disable opt-sensitive tests under tailcall stress and balance pushd. (#11658)
Just what it says on the tin.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/CLRTest.Execute.Bash.targets | 4 | ||||
-rw-r--r-- | tests/src/CLRTest.Execute.Batch.targets | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/tests/src/CLRTest.Execute.Bash.targets b/tests/src/CLRTest.Execute.Bash.targets index 81b302a6bf..f95408f512 100644 --- a/tests/src/CLRTest.Execute.Bash.targets +++ b/tests/src/CLRTest.Execute.Bash.targets @@ -83,9 +83,9 @@ fi ]]></BashCLRTestEnvironmentCompatibilityCheck> <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true'"><![CDATA[ $(BashCLRTestEnvironmentCompatibilityCheck) -if [ \( ! -z "$COMPlus_JitStress" \) -o \( ! -z "$COMPlus_JitStressRegs" \) -o \( ! -z "$COMPlus_JITMinOpts" \) ] +if [ \( ! -z "$COMPlus_JitStress" \) -o \( ! -z "$COMPlus_JitStressRegs" \) -o \( ! -z "$COMPlus_JITMinOpts" \) -o \( ! -z "$COMPlus_TailcallStress" \) ] then - echo "SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts) IS SET" + echo "SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts, COMPlus_TailcallStress) IS SET" exit $(GCBashScriptExitCode) fi ]]></BashCLRTestEnvironmentCompatibilityCheck> diff --git a/tests/src/CLRTest.Execute.Batch.targets b/tests/src/CLRTest.Execute.Batch.targets index 5135fc21c7..b4a7e76947 100644 --- a/tests/src/CLRTest.Execute.Batch.targets +++ b/tests/src/CLRTest.Execute.Batch.targets @@ -72,13 +72,15 @@ WARNING: When setting properties based on their current state (for example: $(BatchCLRTestEnvironmentCompatibilityCheck) IF NOT "%COMPlus_GCStress%"=="" ( ECHO SKIPPING EXECUTION BECAUSE COMPlus_GCStress IS SET + popd Exit /b 0 ) ]]></BatchCLRTestEnvironmentCompatibilityCheck> <BatchCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true'"><![CDATA[ $(BatchCLRTestEnvironmentCompatibilityCheck) -IF "%COMPlus_JitStress%"=="" IF "%COMPlus_JitStressRegs%"=="" IF "%COMPlus_JITMinOpts%"=="" goto :Compatible1 - ECHO SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts) IS SET +IF "%COMPlus_JitStress%"=="" IF "%COMPlus_JitStressRegs%"=="" IF "%COMPlus_JITMinOpts%"=="" IF "%COMPlus_TailcallStress%"=="" goto :Compatible1 + ECHO SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts, COMPlus_TailcallStress) IS SET + popd Exit /b 0 :Compatible1 ]]></BatchCLRTestEnvironmentCompatibilityCheck> @@ -86,6 +88,7 @@ IF "%COMPlus_JitStress%"=="" IF "%COMPlus_JitStressRegs%"=="" IF "%COMPlus_JITMi $(BatchCLRTestEnvironmentCompatibilityCheck) IF NOT "%COMPlus_HeapVerify%"=="" ( ECHO SKIPPING EXECUTION BECAUSE COMPlus_HeapVerify IS SET + popd Exit /b 0 ) ]]></BatchCLRTestEnvironmentCompatibilityCheck> @@ -108,10 +111,12 @@ ECHO Actual: %CLRTestExitCode% IF NOT "%CLRTestExitCode%"=="%CLRTestExpectedExitCode%" ( ECHO END EXECUTION - FAILED ECHO FAILED + popd Exit /b 1 ) ELSE ( ECHO END EXECUTION - PASSED ECHO PASSED + popd Exit /b 0 ) @@ -121,11 +126,13 @@ IF NOT "!ERRORLEVEL!"=="0" ( timeout /t 10 /nobreak goto :TakeLock ) +popd Exit /b 2 :ReleaseLock if exist %lockFolder% rd /s /q %lockFolder% +popd Exit /b 0 ]]></BatchCLRTestExitCodeCheck> </PropertyGroup> @@ -182,6 +189,7 @@ set Assemblies=-a System.Private.CoreLib IF defined DoLink ( IF NOT EXIST !ILLINK! ( ECHO ILLink executable [%ILLINK%] Invalid + popd Exit /b 1 ) @@ -208,6 +216,7 @@ IF defined DoLink ( IF NOT defined KeepLinkedBinaries ( IF EXIST %LinkBin% rmdir /s /q %LinkBin% ) + popd Exit /b 1 ) @@ -333,6 +342,7 @@ ECHO - OPTIONS - @(BatchCLRTestExecutionScriptArgument -> 'ECHO -%(Identity) %(ParamName) ECHO %(Description)', ' ') +popd Exit /b 1 :ArgsDone |