From bcef0ae9c39dbf1efab1dca338978b5150b0460b Mon Sep 17 00:00:00 2001
From: Fadi Hanna <fadim@microsoft.com>
Date: Thu, 5 Dec 2019 11:59:37 -0800
Subject: [PATCH] Unset RunCrossgen2 variable when CrossGenTest is set to false
 (#583)

---
 src/coreclr/tests/src/CLRTest.CrossGen.targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/coreclr/tests/src/CLRTest.CrossGen.targets b/src/coreclr/tests/src/CLRTest.CrossGen.targets
index c074e68..97d4745 100644
--- a/src/coreclr/tests/src/CLRTest.CrossGen.targets
+++ b/src/coreclr/tests/src/CLRTest.CrossGen.targets
@@ -27,6 +27,8 @@ WARNING:   When setting properties based on their current state (for example:
     <CLRTestBatchEnvironmentVariable Condition="'$(CrossGenTest)' == 'true'" Include = "set RunCrossGen=1"/>
     <CLRTestBashEnvironmentVariable  Condition="'$(CrossGenTest)' == 'false'" Include = "unset RunCrossGen"/>
     <CLRTestBatchEnvironmentVariable Condition="'$(CrossGenTest)' == 'false'" Include = "set RunCrossGen="/>
+    <CLRTestBashEnvironmentVariable  Condition="'$(CrossGenTest)' == 'false'" Include = "unset RunCrossGen2"/>
+    <CLRTestBatchEnvironmentVariable Condition="'$(CrossGenTest)' == 'false'" Include = "set RunCrossGen2="/>
   </ItemGroup>
 
   <!--
-- 
2.7.4