Skip to content

Fix timeouts in coreroot_determinism test in GC stress mode #56770

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

Merged
trylek merged 1 commit into from
Aug 3, 2021
Merged

Fix timeouts in coreroot_determinism test in GC stress mode #56770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fix timeouts in coreroot_determinism test in GC stress mode 
I have found two deficiencies in our CoreCLR test infrastructure
related to running Crossgen2 in GC stress mode; this change should
fix both:

1) In the Unix (bash) variant of Execute.Crossgen.targets we weren't
properly unsetting the GC stress-related COMPlus environment
variables.

2) In the particular case of the coreroot_determinism test this
needed fixing in r2rtest that is internally used by the test
implementation (on both Windows and Unix).

Thanks

Tomas
  • Loading branch information
@trylek
trylek committed Aug 3, 2021
commit a184abaab8e0524b26eda2b9e15c77680f5307ac
4 changes: 4 additions & 0 deletions src/coreclr/tools/r2rtest/Crossgen2Runner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ public override ProcessParameters CompilationProcess(string outputFileName, IEnu
{
ProcessParameters processParameters = base.CompilationProcess(outputFileName, inputAssemblyFileNames);
processParameters.Arguments = $"{Crossgen2Path} {processParameters.Arguments}";
processParameters.EnvironmentOverrides["COMPlus_GCStress"] = "";
processParameters.EnvironmentOverrides["COMPlus_HeapVerify"] = "";
processParameters.EnvironmentOverrides["COMPlus_ReadyToRun"] = "";
processParameters.EnvironmentOverrides["COMPlus_GCName"] = "";
return processParameters;
}

Expand Down
6 changes: 3 additions & 3 deletions src/tests/Common/CLRTest.CrossGen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
local heapVerifyModeToRestore=$COMPlus_HeapVerify;
local readyToRunModeToRestore=$COMPlus_ReadyToRun;
local gcstandaloneModeToRestore=$COMPlus_GCName;
export COMPlus_GCStress=
export COMPlus_HeapVerify=
export COMPlus_ReadyToRun=
unset COMPlus_GCStress
Copy link
Member

@AntonLapounov AntonLapounov Aug 5, 2021

Choose a reason for hiding this comment

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

I am wondering how this could make any difference. Exporting COMPlus_GCStress='' should still disable GC stress, shouldn't it?

Copy link
Member Author

@trylek trylek Aug 9, 2021

Choose a reason for hiding this comment

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

Well, according to JanV setting the environment variable in bash to an empty string doesn't have the expected effect of removing the variable. It probably matters not as you've already refactored the entire logic for manipulating these variables.

unset COMPlus_HeapVerify
unset COMPlus_ReadyToRun
unset COMPlus_GCName

__Command=$_DebuggerFullPath
Expand Down