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/tests/baseservices | |
| 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/tests/baseservices')
5 files changed, 15 insertions, 18 deletions
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> |