Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not run crossgen2 under GC stress in tests #56949

Merged
merged 2 commits into from
Aug 9, 2021
Merged

Do not run crossgen2 under GC stress in tests #56949

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35021e3
Do not run crossgen2 under GC stress in tests
AntonLapounov Aug 6, 2021
81b6f00
EndLocal does not change ErrorLevel's value
AntonLapounov Aug 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 13 additions & 30 deletions src/tests/Common/CLRTest.CrossGen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,6 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
__ResponseFile="$__OutputFile.rsp"
rm $__ResponseFile

# Suppress the GC stress COMPlus for the duration of Crossgen2 execution
local gcStressModeToRestore=$COMPlus_GCStress;
local heapVerifyModeToRestore=$COMPlus_HeapVerify;
local readyToRunModeToRestore=$COMPlus_ReadyToRun;
local gcstandaloneModeToRestore=$COMPlus_GCName;
unset COMPlus_GCStress
unset COMPlus_HeapVerify
unset COMPlus_ReadyToRun
unset COMPlus_GCName

__Command=$_DebuggerFullPath
# Tests run locally need __TestDotNetCmd (set by runtest.py) or a compatible 5.0 dotnet runtime in the path
if [ ! -z ${__TestDotNetCmd+x} ] %3B then
Expand All @@ -115,14 +105,15 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then

echo "Response file: $__ResponseFile"
cat $__ResponseFile

# Suppress some COMPlus variables for the duration of Crossgen2 execution
export -n COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun

echo "Running CrossGen2: $__Command"
$__Command
__cg2ExitCode=$?

export COMPlus_GCName=$gcstandaloneModeToRestore
export COMPlus_GCStress=$gcStressModeToRestore
export COMPlus_HeapVerify=$heapVerifyModeToRestore
export COMPlus_ReadyToRun=$readyToRunModeToRestore
export COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun
}

if [ ! -z ${CompositeBuildMode+x} ]%3B then
Expand Down Expand Up @@ -220,16 +211,6 @@ if defined RunCrossGen2 (
set __ResponseFile=!__OutputFile!.rsp
del /Q !__ResponseFile!

REM Suppress GC stress mode for the duration of Crossgen2 execution
set __gcStressModeToRestore=!COMPlus_GCStress!
set COMPlus_GCStress=
set __heapVerifyModeToRestore=!COMPlus_HeapVerify!
set COMPlus_HeapVerify=
set __readyToRunModeToRestore=!COMPlus_ReadyToRun!
set COMPlus_ReadyToRun=
set __gcStandaloneModeToRestore=!COMPlus_GCName!
set COMPlus_GCName=

set __Command=!_DebuggerFullPath!
REM Tests run locally need __TestDotNetCmd (set by runtest.py) or a compatible 5.0 dotnet runtime in the path
if defined __TestDotNetCmd (
Expand Down Expand Up @@ -257,14 +238,16 @@ if defined RunCrossGen2 (
echo Response file: !__ResponseFile!
type !__ResponseFile!

REM Suppress some COMPlus variables for the duration of Crossgen2 execution
setlocal
set "COMPlus_GCName="
set "COMPlus_GCStress="
set "COMPlus_HeapVerify="
set "COMPlus_ReadyToRun="

echo "!__Command!"
call !__Command!
set CrossGen2Status=!ERRORLEVEL!
set COMPlus_GCStress=!__gcStressModeToRestore!
set COMPlus_HeapVerify=!__heapVerifyModeToRestore!
set COMPlus_ReadyToRun=!__readyToRunModeToRestore!
set COMPlus_GCName=!__gcStandaloneModeToRestore!

endlocal & set CrossGen2Status=%ERRORLEVEL%
Exit /b 0

:DoneCrossgen2Operations
Expand Down
18 changes: 16 additions & 2 deletions src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>true</Optimize>
<CLRTestPriority>0</CLRTestPriority>
<!-- Disable test for GCStress. Tracking: https://github.com/dotnet/runtime/issues/54203 -->
<GCStressIncompatible>true</GCStressIncompatible>
<!-- Generated shell script and corresponding assembly have different names -->
<CLRTestTargetUnsupported Condition="'$(TargetOS)' == 'Android'">true</CLRTestTargetUnsupported>
</PropertyGroup>
Expand All @@ -24,13 +22,29 @@
<CLRTestBatchPreCommands><![CDATA[
$(CLRTestBatchPreCommands)
mkdir r2r

REM Suppress some COMPlus variables for the duration of Crossgen2 execution
setlocal
set "COMPlus_GCName="
set "COMPlus_GCStress="
set "COMPlus_HeapVerify="
set "COMPlus_ReadyToRun="

"%CORE_ROOT%\corerun" %CORE_ROOT%\crossgen2\crossgen2.dll --out r2r\$(MSBuildProjectName).dll $(MSBuildProjectName).dll -r %CORE_ROOT%\*.dll

endlocal
set CLRCustomTestLauncher=RunBasicTestWithMcj.cmd --runCustomTest
]]></CLRTestBatchPreCommands>
<BashCLRTestPreCommands><![CDATA[
$(BashCLRTestPreCommands)
mkdir r2r

# Suppress some COMPlus variables for the duration of Crossgen2 execution
export -n COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun

"$CORE_ROOT/corerun" $CORE_ROOT/crossgen2/crossgen2.dll --out r2r/$(MSBuildProjectName).dll $(MSBuildProjectName).dll -r $CORE_ROOT/*.dll

export COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun
chmod +x ./RunBasicTestWithMcj.sh
export CLRCustomTestLauncher="./RunBasicTestWithMcj.sh --runCustomTest"
]]></BashCLRTestPreCommands>
Expand Down
2 changes: 0 additions & 2 deletions src/tests/readytorun/coreroot_determinism/coreroot_determinism.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
<CLRTestKind>BuildAndRun</CLRTestKind>
<CLRTestPriority>0</CLRTestPriority>
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' != 'coreclr'">true</CLRTestTargetUnsupported>
<!-- See https://github.com/dotnet/runtime/issues/50704 -->
<GCStressIncompatible>true</GCStressIncompatible>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test should pass after #56770 disabled propagating COMPlus_GCStress environment variable to crossgen2.

<!-- This is an explicit crossgen test -->
<CrossGenTest>false</CrossGenTest>
<OldToolsVersion>2.0</OldToolsVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/tests/readytorun/determinism/crossgen2determinism.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<CLRTestKind>BuildAndRun</CLRTestKind>
<CLRTestPriority>0</CLRTestPriority>
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' != 'coreclr'">true</CLRTestTargetUnsupported>
<!-- Known not to work with GCStress for now: https://github.com/dotnet/runtime/issues/13394 -->
<!-- Running Crossgen2 under GCStress takes too long -->
<GCStressIncompatible>true</GCStressIncompatible>
<!-- This is an explicit crossgen test -->
<CrossGenTest>false</CrossGenTest>
Expand Down
3 changes: 2 additions & 1 deletion src/tests/readytorun/multifolder/multifolder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<PropertyGroup>
<OutputType>exe</OutputType>
<CLRTestKind>BuildAndRun</CLRTestKind>
<GCStressIncompatible>true</GCStressIncompatible> <!-- https://github.com/dotnet/runtime/issues/39933 -->
<!-- Running Crossgen2 under GCStress takes too long -->
<GCStressIncompatible>true</GCStressIncompatible>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<CLRTestPriority>0</CLRTestPriority>

Expand Down
18 changes: 16 additions & 2 deletions src/tests/readytorun/tests/mainv1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<OutputType>exe</OutputType>
<CLRTestKind>BuildAndRun</CLRTestKind>
<CrossGenTest>false</CrossGenTest>
<!-- Disabled under GCStress. Tracking issue: https://github.com/dotnet/runtime/issues/54203 -->
<GCStressIncompatible>true</GCStressIncompatible>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="fieldgetter.ilproj" />
Expand All @@ -19,6 +17,14 @@
<PropertyGroup>
<CLRTestBatchPreCommands><![CDATA[
$(CLRTestBatchPreCommands)

REM Suppress some COMPlus variables for the duration of Crossgen2 execution
setlocal
set "COMPlus_GCName="
set "COMPlus_GCStress="
set "COMPlus_HeapVerify="
set "COMPlus_ReadyToRun="

DEL test.dll
if exist test.dll (
echo FAILED to delete test.dll
Expand Down Expand Up @@ -65,9 +71,15 @@ if not exist mainv1.ni.dll (
echo FAILED to build mainv1.ni.dll
exit /b 1
)

endlocal
]]></CLRTestBatchPreCommands>
<BashCLRTestPreCommands><![CDATA[
$(BashCLRTestPreCommands)

# Suppress some COMPlus variables for the duration of Crossgen2 execution
export -n COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun

rm -f test.dll
if [ -f test.dll ]
then
Expand Down Expand Up @@ -121,6 +133,8 @@ then
echo Failed to build mainv1.ni.dll
exit 1
fi

export COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun
]]></BashCLRTestPreCommands>
</PropertyGroup>
</Project>
18 changes: 16 additions & 2 deletions src/tests/readytorun/tests/mainv2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<OutputType>exe</OutputType>
<CLRTestKind>BuildAndRun</CLRTestKind>
<CrossGenTest>false</CrossGenTest>
<!-- Disabled under GCStress. Tracking issue: https://github.com/dotnet/runtime/issues/54203 -->
<GCStressIncompatible>true</GCStressIncompatible>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="fieldgetter.ilproj" />
Expand All @@ -17,6 +15,14 @@
<PropertyGroup>
<CLRTestBatchPreCommands><![CDATA[
$(CLRTestBatchPreCommands)

REM Suppress some COMPlus variables for the duration of Crossgen2 execution
setlocal
set "COMPlus_GCName="
set "COMPlus_GCStress="
set "COMPlus_HeapVerify="
set "COMPlus_ReadyToRun="

DEL test.dll
if exist test.dll (
echo FAILED to delete test.dll
Expand Down Expand Up @@ -73,9 +79,15 @@ if not exist test.ni.dll (
echo FAILED to build test.ni.dll
exit /b 1
)

endlocal
]]></CLRTestBatchPreCommands>
<BashCLRTestPreCommands><![CDATA[
$(BashCLRTestPreCommands)

# Suppress some COMPlus variables for the duration of Crossgen2 execution
export -n COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun

rm -f test.dll
if [ -f test.dll ]
then
Expand Down Expand Up @@ -142,6 +154,8 @@ then
echo Failed to build test.ni.dll
exit 1
fi

export COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun
]]></BashCLRTestPreCommands>
</PropertyGroup>
</Project>