From 65d75c7e2d3b8a35249ad66413f98d8c6075e699 Mon Sep 17 00:00:00 2001
From: Jan Vorlicek <janvorli@microsoft.com>
Date: Thu, 27 Jun 2019 21:46:26 +0200
Subject: Fix VersionBubbles test (#25392)

The test was not crossgening with large version bubble enabled since
the part of the .csproj that generates part of the .sh/.bat test
running scripts was commented out. There were also bugs in the
commented out code. Also, to ensure that it works, tiered compilation
and jit minopts need to be disables to ensure that the test method
won't be re-jitted.
---
 .../tests/versionbubbles/versionbubbles.csproj        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'tests')

diff --git a/tests/src/readytorun/tests/versionbubbles/versionbubbles.csproj b/tests/src/readytorun/tests/versionbubbles/versionbubbles.csproj
index be0ec17629..e3d0ca3fe8 100644
--- a/tests/src/readytorun/tests/versionbubbles/versionbubbles.csproj
+++ b/tests/src/readytorun/tests/versionbubbles/versionbubbles.csproj
@@ -15,8 +15,6 @@
     <CLRTestPriority>1</CLRTestPriority>
     <DebugType>PdbOnly</DebugType>
     <Optimize>True</Optimize>
-    <!-- https://github.com/dotnet/coreclr/issues/22245 -->
-    <GCStressIncompatible Condition="'$(Platform)' == 'arm'">true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
@@ -40,21 +38,24 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <!-- <CLRTestBatchPreCommands><![CDATA[
+    <CLRTestBatchPreCommands><![CDATA[
 $(CLRTestBatchPreCommands)
-set COMPLUS_ZAPREQUIRE=1
-set COMPLUS_ZAPREQUIRELIST=helper;versionbubbles
-set _inputFile=versionbubbles.exe
+set COMPlus_ZapRequire=1
+set COMPlus_ZapRequireList=helper%3Bversionbubbles
+set COMPlus_TieredCompilation=0
+set COMPlus_JITMinOpts=0
 %Core_Root%\crossgen /largeversionbubble /readytorun /platform_assemblies_paths %Core_Root%%3B%25CD% /out helper.ni.dll helper.dll
 %Core_Root%\crossgen /largeversionbubble /readytorun /platform_assemblies_paths %Core_Root%%3B%25CD% /out versionbubbles.ni.exe versionbubbles.exe
 ]]></CLRTestBatchPreCommands>
   <BashCLRTestPreCommands><![CDATA[
-export COMPLUS_ZAPREQUIRE=1
-export COMPLUS_ZAPREQUIRELIST=helper;versionbubbles
 $(BashCLRTestPreCommands)
+export COMPlus_ZapRequire=1
+export COMPlus_ZapRequireList="helper%3Bversionbubbles"
+export COMPlus_TieredCompilation=0
+export COMPlus_JITMinOpts=0
 $CORE_ROOT/crossgen -largeversionbubble -readytorun -platform_assemblies_paths $CORE_ROOT:`pwd` -out helper.ni.dll helper.dll
 $CORE_ROOT/crossgen -largeversionbubble -readytorun -platform_assemblies_paths $CORE_ROOT:`pwd` -out versionbubbles.ni.exe versionbubbles.exe
-]]></BashCLRTestPreCommands> -->
+]]></BashCLRTestPreCommands>
   </PropertyGroup>  
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
-- 
cgit v1.2.3