diff options
author | David Wrighton <davidwr@microsoft.com> | 2021-07-21 11:08:52 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-21 11:08:52 +0300 |
commit | 415356fd661764d9413ab6d41d827868dbb81447 (patch) | |
tree | 89092227b360294d15bd5d2380ac78addcac9174 /src | |
parent | 3746672c5b78f0aacf43ee1d170c3ca88c34ce91 (diff) |
Convert the last crossgen tests to use crossgen2 (#56061)
- take advantage of the AlwaysUseCrossGen2 flag instead of manually updating all the crossgen commands
- remove version bubbles test. We have much more complex testing for that scenario now
- remove regular crossgen logic from the script generator
Diffstat (limited to 'src')
14 files changed, 32 insertions, 212 deletions
diff --git a/src/tests/Common/CLRTest.CrossGen.targets b/src/tests/Common/CLRTest.CrossGen.targets index a5b98a2e45a..8557a71f0d5 100644 --- a/src/tests/Common/CLRTest.CrossGen.targets +++ b/src/tests/Common/CLRTest.CrossGen.targets @@ -32,6 +32,8 @@ WARNING: When setting properties based on their current state (for example: --> <Target Name="GetCrossgenBashScript"> + <Error Text="Setting both AlwaysUseCrossGen2 to true and CrossGenTest to false is non-sensical" Condition="'$(CrossGenTest)' == 'false' and '$(AlwaysUseCrossGen2)' == 'true'"/> + <PropertyGroup> <CrossgenBashScript Condition="'$(CLRTestKind)' == 'BuildAndRun' and '$(CrossGenTest)' != 'false'"> <![CDATA[ @@ -42,31 +44,6 @@ if [ "$(AlwaysUseCrossGen2)" == "true" ]; then export CompositeBuildMode=1 fi -# CrossGen Script -if [ ! -z ${RunCrossGen+x} ]%3B then - export COMPlus_ZapRequire=$(ZapRequire) - export COMPlus_ZapRequireList=$(MSBuildProjectName) - if [ ! -f $(MSBuildProjectName).org ]%3B then - TakeLock - if [ ! -f $(MSBuildProjectName).org ]%3B then - mkdir IL - cp $(MSBuildProjectName).dll IL/$(MSBuildProjectName).dll - mv $(MSBuildProjectName).dll $(MSBuildProjectName).org - __Command=$_DebuggerFullPath "$CORE_ROOT/crossgen" /Platform_Assemblies_Paths $CORE_ROOT%3A$PWD /in $(MSBuildProjectName).org /out $(MSBuildProjectName).dll - echo $__Command - $__Command - __cgExitCode=$? - if [ $__cgExitCode -ne 0 ] - then - echo Crossgen failed with exitcode: $__cgExitCode - ReleaseLock - exit 1 - fi - fi - ReleaseLock - fi -fi - # CrossGen2 Script if [ ! -z ${RunCrossGen2+x} ]%3B then compilationDoneFlagFile="IL-CG2/done" @@ -166,6 +143,9 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then fi ReleaseLock fi + + export COMPlus_ZapRequire=$(ZapRequire) + export COMPlus_ZapRequireList=$(MSBuildProjectName) fi ]]> </CrossgenBashScript> @@ -185,31 +165,6 @@ if /i "$(AlwaysUseCrossGen2)" == "true" ( set CompositeBuildMode=1 ) -REM CrossGen Script -if defined RunCrossGen ( - if defined LargeVersionBubble ( set OptionalArguments=!OptionalArguments! /largeversionbubble) - set COMPlus_ZapRequire=$(ZapRequire) - set COMPlus_ZapRequireList=$(MSBuildProjectName) - if not exist "$(MSBuildProjectName).org" ( - call :TakeLock - set CrossGenStatus=0 - if not exist "$(MSBuildProjectName).org" ( - mkdir IL - copy $(MSBuildProjectName).dll IL\$(MSBuildProjectName).dll - ren $(MSBuildProjectName).dll $(MSBuildProjectName).org - set __Command=!_DebuggerFullPath! "!CORE_ROOT!\crossgen.exe" !OptionalArguments! /Platform_Assemblies_Paths !CORE_ROOT!%3B%25cd%25 /in %21scriptPath%21$(MSBuildProjectName).org /out %21scriptPath%21\$(MSBuildProjectName).dll - echo "!__Command!" - call !__Command! - set CrossGenStatus=!ERRORLEVEL! - ) - call :ReleaseLock - IF NOT !CrossGenStatus!==0 ( - ECHO Crossgen failed with exitcode - !CrossGenStatus! - Exit /b 1 - ) - ) -) - REM CrossGen2 Script if defined RunCrossGen2 ( set ExtraCrossGen2Args=!ExtraCrossGen2Args! $(CrossGen2TestExtraArguments) @@ -309,6 +264,9 @@ if defined RunCrossGen2 ( ECHO Crossgen2 failed with exitcode - !CrossGen2Status! Exit /b 1 ) + + set COMPlus_ZapRequire=$(ZapRequire) + set COMPlus_ZapRequireList=$(MSBuildProjectName) ) ]]> </CrossgenBatchScript> diff --git a/src/tests/baseservices/TieredCompilation/BasicTest_DefaultMode_R2r.csproj b/src/tests/baseservices/TieredCompilation/BasicTest_DefaultMode_R2r.csproj index c70b31875bc..0fc2f0156e2 100644 --- a/src/tests/baseservices/TieredCompilation/BasicTest_DefaultMode_R2r.csproj +++ b/src/tests/baseservices/TieredCompilation/BasicTest_DefaultMode_R2r.csproj @@ -4,18 +4,11 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Optimize>true</Optimize> <CLRTestPriority>0</CLRTestPriority> + + <!-- This is an explicit crossgen test --> + <AlwaysUseCrossGen2>true</AlwaysUseCrossGen2> </PropertyGroup> <ItemGroup> <Compile Include="BasicTest.cs" /> </ItemGroup> - <PropertyGroup> - <CLRTestBatchPreCommands><![CDATA[ -$(CLRTestBatchPreCommands) -"%CORE_ROOT%\crossgen" -ReadyToRun -Platform_Assemblies_Paths "%CORE_ROOT%" -out $(MSBuildProjectName).ni.dll $(MSBuildProjectName).dll -]]></CLRTestBatchPreCommands> - <BashCLRTestPreCommands><![CDATA[ -$(BashCLRTestPreCommands) -"$CORE_ROOT/crossgen" -ReadyToRun -Platform_Assemblies_Paths "$CORE_ROOT" -out $(MSBuildProjectName).ni.dll $(MSBuildProjectName).dll -]]></BashCLRTestPreCommands> - </PropertyGroup> </Project> diff --git a/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitForLoopsOff_R2r.csproj b/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitForLoopsOff_R2r.csproj index 12a7d3b53f1..cde6bf57b4f 100644 --- a/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitForLoopsOff_R2r.csproj +++ b/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitForLoopsOff_R2r.csproj @@ -4,6 +4,9 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Optimize>true</Optimize> <CLRTestPriority>0</CLRTestPriority> + + <!-- This is an explicit crossgen test --> + <AlwaysUseCrossGen2>true</AlwaysUseCrossGen2> </PropertyGroup> <ItemGroup> <Compile Include="BasicTest.cs" /> @@ -11,12 +14,10 @@ <PropertyGroup> <CLRTestBatchPreCommands><![CDATA[ $(CLRTestBatchPreCommands) -"%CORE_ROOT%\crossgen" -ReadyToRun -Platform_Assemblies_Paths "%CORE_ROOT%" -out $(MSBuildProjectName).ni.dll $(MSBuildProjectName).dll set COMPlus_TC_QuickJitForLoops=0 ]]></CLRTestBatchPreCommands> <BashCLRTestPreCommands><![CDATA[ $(BashCLRTestPreCommands) -"$CORE_ROOT/crossgen" -ReadyToRun -Platform_Assemblies_Paths "$CORE_ROOT" -out $(MSBuildProjectName).ni.dll $(MSBuildProjectName).dll export COMPlus_TC_QuickJitForLoops=0 ]]></BashCLRTestPreCommands> </PropertyGroup> diff --git a/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitForLoopsOn_R2r.csproj b/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitForLoopsOn_R2r.csproj index dd8ccaf5371..d6bff3ce0ca 100644 --- a/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitForLoopsOn_R2r.csproj +++ b/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitForLoopsOn_R2r.csproj @@ -4,6 +4,9 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Optimize>true</Optimize> <CLRTestPriority>0</CLRTestPriority> + + <!-- This is an explicit crossgen test --> + <AlwaysUseCrossGen2>true</AlwaysUseCrossGen2> </PropertyGroup> <ItemGroup> <Compile Include="BasicTest.cs" /> @@ -11,12 +14,10 @@ <PropertyGroup> <CLRTestBatchPreCommands><![CDATA[ $(CLRTestBatchPreCommands) -"%CORE_ROOT%\crossgen" -ReadyToRun -Platform_Assemblies_Paths "%CORE_ROOT%" -out $(MSBuildProjectName).ni.dll $(MSBuildProjectName).dll set COMPlus_TC_QuickJitForLoops=1 ]]></CLRTestBatchPreCommands> <BashCLRTestPreCommands><![CDATA[ $(BashCLRTestPreCommands) -"$CORE_ROOT/crossgen" -ReadyToRun -Platform_Assemblies_Paths "$CORE_ROOT" -out $(MSBuildProjectName).ni.dll $(MSBuildProjectName).dll export COMPlus_TC_QuickJitForLoops=1 ]]></BashCLRTestPreCommands> </PropertyGroup> diff --git a/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitOff_R2r.csproj b/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitOff_R2r.csproj index 2c6b31add62..351d8426cc8 100644 --- a/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitOff_R2r.csproj +++ b/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitOff_R2r.csproj @@ -4,6 +4,9 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Optimize>true</Optimize> <CLRTestPriority>0</CLRTestPriority> + + <!-- This is an explicit crossgen test --> + <AlwaysUseCrossGen2>true</AlwaysUseCrossGen2> </PropertyGroup> <ItemGroup> <Compile Include="BasicTest.cs" /> @@ -11,12 +14,10 @@ <PropertyGroup> <CLRTestBatchPreCommands><![CDATA[ $(CLRTestBatchPreCommands) -"%CORE_ROOT%\crossgen" -ReadyToRun -Platform_Assemblies_Paths "%CORE_ROOT%" -out $(MSBuildProjectName).ni.dll $(MSBuildProjectName).dll set COMPlus_TC_QuickJit=0 ]]></CLRTestBatchPreCommands> <BashCLRTestPreCommands><![CDATA[ $(BashCLRTestPreCommands) -"$CORE_ROOT/crossgen" -ReadyToRun -Platform_Assemblies_Paths "$CORE_ROOT" -out $(MSBuildProjectName).ni.dll $(MSBuildProjectName).dll export COMPlus_TC_QuickJit=0 ]]></BashCLRTestPreCommands> </PropertyGroup> diff --git a/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitOn_R2r.csproj b/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitOn_R2r.csproj index a1c9ebb3ef0..a8bfb516443 100644 --- a/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitOn_R2r.csproj +++ b/src/tests/baseservices/TieredCompilation/BasicTest_QuickJitOn_R2r.csproj @@ -4,6 +4,9 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Optimize>true</Optimize> <CLRTestPriority>0</CLRTestPriority> + + <!-- This is an explicit crossgen test --> + <AlwaysUseCrossGen2>true</AlwaysUseCrossGen2> </PropertyGroup> <ItemGroup> <Compile Include="BasicTest.cs" /> @@ -11,12 +14,10 @@ <PropertyGroup> <CLRTestBatchPreCommands><![CDATA[ $(CLRTestBatchPreCommands) -"%CORE_ROOT%\crossgen" -ReadyToRun -Platform_Assemblies_Paths "%CORE_ROOT%" -out $(MSBuildProjectName).ni.dll $(MSBuildProjectName).dll set COMPlus_TC_QuickJit=1 ]]></CLRTestBatchPreCommands> <BashCLRTestPreCommands><![CDATA[ $(BashCLRTestPreCommands) -"$CORE_ROOT/crossgen" -ReadyToRun -Platform_Assemblies_Paths "$CORE_ROOT" -out $(MSBuildProjectName).ni.dll $(MSBuildProjectName).dll export COMPlus_TC_QuickJit=1 ]]></BashCLRTestPreCommands> </PropertyGroup> diff --git a/src/tests/readytorun/DynamicMethodGCStress/DynamicMethodGCStress.csproj b/src/tests/readytorun/DynamicMethodGCStress/DynamicMethodGCStress.csproj index 2e7ffa53a2a..00065733e7d 100644 --- a/src/tests/readytorun/DynamicMethodGCStress/DynamicMethodGCStress.csproj +++ b/src/tests/readytorun/DynamicMethodGCStress/DynamicMethodGCStress.csproj @@ -5,6 +5,9 @@ <Optimize>true</Optimize> <!-- This test has a secondary thread with an infinite loop --> <UnloadabilityIncompatible>true</UnloadabilityIncompatible> + + <!-- This is an explicit crossgen test --> + <AlwaysUseCrossGen2>true</AlwaysUseCrossGen2> </PropertyGroup> <ItemGroup> <Compile Include="$(MSBuildProjectName).cs" /> @@ -12,14 +15,10 @@ <PropertyGroup> <CLRTestBatchPreCommands><![CDATA[ $(CLRTestBatchPreCommands) -%CORE_ROOT%\crossgen.exe /readytorun /platform_assemblies_paths %CORE_ROOT%%3B%25CD% /out DynamicMethodGCStress.ni.dll DynamicMethodGCStress.dll -set ExePath=DynamicMethodGCStress.ni.dll set COMPlus_GCStress=3 ]]></CLRTestBatchPreCommands> <BashCLRTestPreCommands><![CDATA[ $(BashCLRTestPreCommands) -$CORE_ROOT/crossgen -readytorun -platform_assemblies_paths $CORE_ROOT:`pwd` -out DynamicMethodGCStress.ni.dll DynamicMethodGCStress.dll -ExePath=DynamicMethodGCStress.ni.dll export COMPlus_GCStress=3 ]]></BashCLRTestPreCommands> </PropertyGroup> diff --git a/src/tests/readytorun/tests/fileversionpreservation/fileversionpreservation.csproj b/src/tests/readytorun/tests/fileversionpreservation/fileversionpreservation.csproj index 1ceecd2a654..754833e6443 100644 --- a/src/tests/readytorun/tests/fileversionpreservation/fileversionpreservation.csproj +++ b/src/tests/readytorun/tests/fileversionpreservation/fileversionpreservation.csproj @@ -10,14 +10,4 @@ <Compile Include="fileversionpreservation.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> - <PropertyGroup> - <CLRTestBatchPreCommands><![CDATA[ -$(CLRTestBatchPreCommands) -%Core_Root%\crossgen /readytorun /platform_assemblies_paths %Core_Root%%3B%25CD% /out fileversionpreservation.ni.exe fileversionpreservation.exe -]]></CLRTestBatchPreCommands> - <BashCLRTestPreCommands><![CDATA[ -$(BashCLRTestPreCommands) -$CORE_ROOT/crossgen -readytorun -platform_assemblies_paths $CORE_ROOT:`pwd` -out fileversionpreservation.ni.exe fileversionpreservation.exe -]]></BashCLRTestPreCommands> - </PropertyGroup> </Project> diff --git a/src/tests/readytorun/tests/genericsload/callgenericctor.csproj b/src/tests/readytorun/tests/genericsload/callgenericctor.csproj index fea80503152..248d330fc53 100644 --- a/src/tests/readytorun/tests/genericsload/callgenericctor.csproj +++ b/src/tests/readytorun/tests/genericsload/callgenericctor.csproj @@ -2,9 +2,10 @@ <PropertyGroup> <OutputType>exe</OutputType> <CLRTestKind>BuildAndRun</CLRTestKind> - <ZapRequire>1</ZapRequire> <CLRTestPriority>1</CLRTestPriority> - <CrossGenTest>false</CrossGenTest> + + <!-- This is an explicit crossgen test --> + <AlwaysUseCrossGen2>true</AlwaysUseCrossGen2> </PropertyGroup> <ItemGroup> <ProjectReference Include="genericslib.ilproj"> @@ -14,16 +15,4 @@ <ItemGroup> <Compile Include="callgenericctor.cs" /> </ItemGroup> - <PropertyGroup> - <CLRTestBatchPreCommands><![CDATA[ -$(CLRTestBatchPreCommands) -%Core_Root%\crossgen /readytorun /platform_assemblies_paths %Core_Root%%3B%25CD% /out genericslib.ni.dll genericslib.dll -%Core_Root%\crossgen /readytorun /platform_assemblies_paths %Core_Root%%3B%25CD% /out callgenericctor.ni.exe callgenericctor.exe -]]></CLRTestBatchPreCommands> - <BashCLRTestPreCommands><![CDATA[ -$(BashCLRTestPreCommands) -$CORE_ROOT/crossgen -readytorun -platform_assemblies_paths $CORE_ROOT:`pwd` -out genericslib.ni.dll genericslib.dll -$CORE_ROOT/crossgen -readytorun -platform_assemblies_paths $CORE_ROOT:`pwd` -out callgenericctor.ni.exe callgenericctor.exe -]]></BashCLRTestPreCommands> - </PropertyGroup> </Project> diff --git a/src/tests/readytorun/tests/genericsload/usegenericfield.csproj b/src/tests/readytorun/tests/genericsload/usegenericfield.csproj index b5a3e659606..da88c6e840e 100644 --- a/src/tests/readytorun/tests/genericsload/usegenericfield.csproj +++ b/src/tests/readytorun/tests/genericsload/usegenericfield.csproj @@ -4,7 +4,9 @@ <CLRTestKind>BuildAndRun</CLRTestKind> <ZapRequire>1</ZapRequire> <CLRTestPriority>1</CLRTestPriority> - <CrossGenTest>false</CrossGenTest> + + <!-- This is an explicit crossgen test --> + <AlwaysUseCrossGen2>true</AlwaysUseCrossGen2> </PropertyGroup> <ItemGroup> <ProjectReference Include="genericslib.ilproj"> @@ -14,16 +16,4 @@ <ItemGroup> <Compile Include="usegenericfield.cs" /> </ItemGroup> - <PropertyGroup> - <CLRTestBatchPreCommands><![CDATA[ -$(CLRTestBatchPreCommands) -%Core_Root%\crossgen /readytorun /platform_assemblies_paths %Core_Root%%3B%25CD% /out genericslib.ni.dll genericslib.dll -%Core_Root%\crossgen /readytorun /platform_assemblies_paths %Core_Root%%3B%25CD% /out usegenericfield.ni.exe usegenericfield.exe -]]></CLRTestBatchPreCommands> - <BashCLRTestPreCommands><![CDATA[ -$(BashCLRTestPreCommands) -$CORE_ROOT/crossgen -readytorun -platform_assemblies_paths $CORE_ROOT:`pwd` -out genericslib.ni.dll genericslib.dll -$CORE_ROOT/crossgen -readytorun -platform_assemblies_paths $CORE_ROOT:`pwd` -out usegenericfield.ni.exe usegenericfield.exe -]]></BashCLRTestPreCommands> - </PropertyGroup> </Project> diff --git a/src/tests/readytorun/tests/versionbubbles/helper.cs b/src/tests/readytorun/tests/versionbubbles/helper.cs deleted file mode 100644 index 0fc5aa66ec4..00000000000 --- a/src/tests/readytorun/tests/versionbubbles/helper.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Diagnostics; -using System.Runtime.CompilerServices; - -public class Helper -{ - [MethodImplAttribute(MethodImplOptions.AggressiveInlining)] - public string GetLastMethodName() - { - StackTrace st = new StackTrace(); - return st.GetFrame(0).GetMethod().Name; - } -} diff --git a/src/tests/readytorun/tests/versionbubbles/helper.csproj b/src/tests/readytorun/tests/versionbubbles/helper.csproj deleted file mode 100644 index 9395dc39839..00000000000 --- a/src/tests/readytorun/tests/versionbubbles/helper.csproj +++ /dev/null @@ -1,10 +0,0 @@ -<Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> - <OutputType>library</OutputType> - <CLRTestKind>SharedLibrary</CLRTestKind> - <Optimize>True</Optimize> - </PropertyGroup> - <ItemGroup> - <Compile Include=".\helper.cs" /> - </ItemGroup> -</Project> diff --git a/src/tests/readytorun/tests/versionbubbles/versionbubbles.cs b/src/tests/readytorun/tests/versionbubbles/versionbubbles.cs deleted file mode 100644 index fd1f596571e..00000000000 --- a/src/tests/readytorun/tests/versionbubbles/versionbubbles.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; - -public class Program -{ - public static int Main() - { - return RunTest(); - } - - public static int RunTest() - { - - Helper helper = new Helper(); - string lastMethodName = String.Empty; - - lastMethodName = helper.GetLastMethodName(); - - if((System.Environment.GetEnvironmentVariable("LargeVersionBubble") == null)) - { - // Cross-Assembly inlining is only allowed in multi-module version bubbles - Console.WriteLine("Large Version Bubble is disabled."); - Console.WriteLine("PASS"); - return 100; - } - - Console.WriteLine("Large Version Bubble is enabled."); - // Helper returns the name of the method in the last stack frame - // Check to see if the method has been inlined cross-module - if (lastMethodName != "GetLastMethodName") - { - // method in helper.cs has been inlined - Console.WriteLine("PASS"); - return 100; - } - else - { - Console.WriteLine("FAIL"); - return 101; - } - } -} diff --git a/src/tests/readytorun/tests/versionbubbles/versionbubbles.csproj b/src/tests/readytorun/tests/versionbubbles/versionbubbles.csproj deleted file mode 100644 index d9e83b34f0e..00000000000 --- a/src/tests/readytorun/tests/versionbubbles/versionbubbles.csproj +++ /dev/null @@ -1,39 +0,0 @@ -<Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> - <OutputType>exe</OutputType> - <CLRTestKind>BuildAndRun</CLRTestKind> - <ZapRequire>1</ZapRequire> - <CLRTestPriority>1</CLRTestPriority> - <DebugType>PdbOnly</DebugType> - <Optimize>True</Optimize> - <CrossGenTest>false</CrossGenTest> - </PropertyGroup> - <ItemGroup> - <ProjectReference Include=".\helper.csproj"> - <Project>{F74F55A1-DFCF-4C7C-B462-E96E1D0BB667}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <Compile Include="$(MSBuildProjectName).cs" /> - </ItemGroup> - <PropertyGroup> - <CLRTestBatchPreCommands><![CDATA[ -$(CLRTestBatchPreCommands) -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[ -$(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> - </PropertyGroup> -</Project> |