summaryrefslogtreecommitdiff
path: root/tests/src
diff options
context:
space:
mode:
authorPat Gavlin <pgavlin@gmail.com>2017-06-05 14:33:58 -0700
committerGitHub <noreply@github.com>2017-06-05 14:33:58 -0700
commit31bec3b1387be343928dabe2f03e808788e6c65d (patch)
tree3313786e5a48ffd00d0ca575c82fa917cd72f874 /tests/src
parent8d33c81d18b010c36e071fa44a7bf9142efe286d (diff)
parent128aabe5906df83f14cae09d5da5cb7d068b2e7b (diff)
downloadcoreclr-31bec3b1387be343928dabe2f03e808788e6c65d.tar.gz
coreclr-31bec3b1387be343928dabe2f03e808788e6c65d.tar.bz2
coreclr-31bec3b1387be343928dabe2f03e808788e6c65d.zip
Merge pull request #12091 from pgavlin/TailCallStress11689
Disable tail call stress in GH_11689 if ZapDisable is enabled.
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/JIT/Regression/JitBlue/GitHub_11689/GitHub_11689.csproj7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_11689/GitHub_11689.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_11689/GitHub_11689.csproj
index 52f50228df..63b9927c67 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_11689/GitHub_11689.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_11689/GitHub_11689.csproj
@@ -35,13 +35,16 @@
<Compile Include="GitHub_11689.cs" />
</ItemGroup>
<PropertyGroup>
+ <!-- NOTE: tailcall stress should be reenabled under zapdisable when #11408 is fixed -->
<CLRTestBatchPreCommands><![CDATA[
$(CLRTestBatchPreCommands)
-set COMPlus_TailcallStress=1
+if "%COMPlus_ZapDisable%"=="" set COMPlus_TailcallStress=1
]]></CLRTestBatchPreCommands>
<BashCLRTestPreCommands><![CDATA[
$(BashCLRTestPreCommands)
-export COMPlus_TailcallStress=1
+if [ -z $COMPlus_ZapDisable ]; then
+ export COMPlus_TailcallStress=1
+fi
]]></BashCLRTestPreCommands>
</PropertyGroup>
<ItemGroup>