From f2913a39793be26a5bb598582c41790593a5e5f8 Mon Sep 17 00:00:00 2001
From: Pat Gavlin <pgavlin@gmail.com>
Date: Tue, 16 May 2017 11:20:37 -0700
Subject: [PATCH] Disable tail call stress in GH_10780 if ZapDisable is
 enabled. (#11649)

* Disable tail call stress in GH_10780 if ZapDisable is enabled.

Tail call stress does not mix well with ZapDisable due to the issues
described in #11408.

Fixes #11648.

* Add a missing semicolon.
---
 tests/src/JIT/Regression/JitBlue/GitHub_10780/GitHub_10780.csproj | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_10780/GitHub_10780.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_10780/GitHub_10780.csproj
index ec7bcb3..6223cb9 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_10780/GitHub_10780.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_10780/GitHub_10780.csproj
@@ -35,13 +35,16 @@
     <Compile Include="GitHub_10780.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>
-- 
2.7.4