Remove usage of ComPlus_ variables in tests (#78377)

In coreclr's configuration cache, DOTNET_ is preferred over COMPlus_

Fix #76484

Co-authored-by: Jan Kotas <jkotas@microsoft.com>

diff --git a/src/tests/Common/CLRTest.CrossGen.targets b/src/tests/Common/CLRTest.CrossGen.targets
index 804698285661b35b4c5d999682da67b7014088b4..850c0c62d9b6d0e1933f2ba563bc46742473f4d4 100644 (file)
--- a/src/tests/Common/CLRTest.CrossGen.targets
+++ b/src/tests/Common/CLRTest.CrossGen.targets
@@ -117,9 +117,8 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
         echo "Response file: $__ResponseFile"
         cat $__ResponseFile
 
-        # Suppress some DOTNET and COMPlus variables for the duration of Crossgen2 execution
+        # Suppress some DOTNET variables for the duration of Crossgen2 execution
         export -n DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun DOTNET_TC_OnStackReplacement DOTNET_TC_PartialCompilation
-        export -n COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun COMPlus_TC_OnStackReplacement COMPlus_TC_PartialCompilation
 
         echo "Running CrossGen2: $__Command"
         $__Command
@@ -130,7 +129,6 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
         __r2rDumpExitCode=$?
 
         export DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun DOTNET_TC_OnStackReplacement DOTNET_TC_PartialCompilation
-        export COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun COMPlus_TC_OnStackReplacement COMPlus_TC_PartialCompilation
         date +%H:%M:%S
       }
 
@@ -278,16 +276,10 @@ if defined RunCrossGen2 (
     set "DOTNET_GCStress="
     set "DOTNET_HeapVerify="
     set "DOTNET_ReadyToRun="
-    set "COMPlus_GCName="
-    set "COMPlus_GCStress="
-    set "COMPlus_HeapVerify="
-    set "COMPlus_ReadyToRun="
 
     REM work around problems in 6.0 OSR
     set "DOTNET_TC_OnStackReplacement="
     set "DOTNET_TC_PartialCompilation="
-    set "COMPlus_TC_OnStackReplacement="
-    set "COMPlus_TC_PartialCompilation="
 
     echo "!__Command!"
     call !__Command!

diff --git a/src/tests/baseservices/RuntimeConfiguration/TestConfig.cs b/src/tests/baseservices/RuntimeConfiguration/TestConfig.cs
index 399ba73bc900eab0a7814b99e6d77b14f7a16c5a..39e20b4f88593ac462a7d481add1bf3b7f2a2289 100644 (file)
--- a/src/tests/baseservices/RuntimeConfiguration/TestConfig.cs
+++ b/src/tests/baseservices/RuntimeConfiguration/TestConfig.cs
@@ -97,7 +97,6 @@ class TestConfig
     {
         // clear some environment variables that we will set during the test run
         Environment.SetEnvironmentVariable("DOTNET_gcServer", null);
-        Environment.SetEnvironmentVariable("COMPlus_gcServer", null);
 
         string corerunPath = GetCorerunPath();
         MethodInfo[] infos = typeof(TestConfig).GetMethods(BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);

diff --git a/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj b/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj
index e2b03a1e23eefe13182b7de946e9aa165c346fb0..250dbf3c13a6ce2b55154970b9c34709606af135 100644 (file)
--- a/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj
+++ b/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj
@@ -28,10 +28,6 @@ set "DOTNET_GCName="
 set "DOTNET_GCStress="
 set "DOTNET_HeapVerify="
 set "DOTNET_ReadyToRun="
-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
 
@@ -42,14 +38,12 @@ set CLRCustomTestLauncher=RunBasicTestWithMcj.cmd --runCustomTest
 $(CLRTestBashPreCommands)
 mkdir r2r
 
-# Suppress some DOTNET and COMPlus variables for the duration of Crossgen2 execution
+# Suppress some DOTNET variables for the duration of Crossgen2 execution
 export -n DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun
-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 DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun
-export COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun
 chmod +x ./RunBasicTestWithMcj.sh
 export CLRCustomTestLauncher="./RunBasicTestWithMcj.sh --runCustomTest"
 ]]></CLRTestBashPreCommands>

diff --git a/src/tests/readytorun/multifolder/multifolder.csproj b/src/tests/readytorun/multifolder/multifolder.csproj
index 8a2be6fc1eaa1136f15ba6af72263d6037678d3f..67e75c04322cbab66759d38cf039fab7cd7f29a8 100644 (file)
--- a/src/tests/readytorun/multifolder/multifolder.csproj
+++ b/src/tests/readytorun/multifolder/multifolder.csproj
@@ -43,8 +43,6 @@ $(CLRTestBatchPreCommands)
     REM Suppress GC stand alone mode for the duration of Crossgen2 execution
     set __gcStandaloneModeToRestore=!DOTNET_GCName!
     set DOTNET_GCName=
-    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
@@ -93,9 +91,8 @@ $(CLRTestBashPreCommands)
     echo $__OutputDir/../FolderA/FolderA/FolderA.dll>>$__ResponseFile
     echo $__OutputDir/../FolderB/FolderB/FolderB.dll>>$__ResponseFile
 
-    # Suppress some DOTNET and COMPlus variables for the duration of Crossgen2 execution
+    # Suppress some DOTNET variables for the duration of Crossgen2 execution
     export -n DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun DOTNET_TC_OnStackReplacement DOTNET_TC_PartialCompilation
-    export -n COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun COMPlus_TC_OnStackReplacement COMPlus_TC_PartialCompilation
 
     __Command=$_DebuggerFullPath
     # Tests run locally need __TestDotNetCmd (set by runtest.py) or a compatible 5.0 dotnet runtime in the path

diff --git a/src/tests/readytorun/tests/mainv1.csproj b/src/tests/readytorun/tests/mainv1.csproj
index eae10d7f64239ebedd12df69de4ea68daaeb247a..1b9c55e1eac58af8d5df9caa85dbf3a5f8a84d69 100644 (file)
--- a/src/tests/readytorun/tests/mainv1.csproj
+++ b/src/tests/readytorun/tests/mainv1.csproj
@@ -25,10 +25,6 @@ set "DOTNET_GCName="
 set "DOTNET_GCStress="
 set "DOTNET_HeapVerify="
 set "DOTNET_ReadyToRun="
-set "COMPlus_GCName="
-set "COMPlus_GCStress="
-set "COMPlus_HeapVerify="
-set "COMPlus_ReadyToRun="
 
 md IL_DLLS
 if not exist IL_DLLS\fieldgetter.dll (
@@ -88,9 +84,8 @@ endlocal
     <CLRTestBashPreCommands><![CDATA[
 $(CLRTestBashPreCommands)
 
-# Suppress some DOTNET and COMPlus variables for the duration of Crossgen2 execution
+# Suppress some DOTNET variables for the duration of Crossgen2 execution
 export -n DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun
-export -n COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun
 
 mkdir IL_DLLS
 

diff --git a/src/tests/readytorun/tests/mainv2.csproj b/src/tests/readytorun/tests/mainv2.csproj
index eaf35fd22d967fe3db9fc3c6869f409f88071618..458297faf72fd2977c929a1f73db37f9491d66d7 100644 (file)
--- a/src/tests/readytorun/tests/mainv2.csproj
+++ b/src/tests/readytorun/tests/mainv2.csproj
@@ -23,10 +23,6 @@ set "DOTNET_GCName="
 set "DOTNET_GCStress="
 set "DOTNET_HeapVerify="
 set "DOTNET_ReadyToRun="
-set "COMPlus_GCName="
-set "COMPlus_GCStress="
-set "COMPlus_HeapVerify="
-set "COMPlus_ReadyToRun="
 
 md IL_DLLS
 if not exist IL_DLLS\fieldgetter.dll (
@@ -88,9 +84,8 @@ endlocal
     <CLRTestBashPreCommands><![CDATA[
 $(CLRTestBashPreCommands)
 
-# Suppress some DOTNET and COMPlus variables for the duration of Crossgen2 execution
+# Suppress some DOTNET variables for the duration of Crossgen2 execution
 export -n DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun
-export -n COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun
 
 mkdir IL_DLLS