Convert tests under GC subtree to the merged test model (dotnet#92543)

Co-authored-by: Jeremy Koritzinsky <jekoritz@microsoft.com>

eng/pipelines/common/templates/runtimes/build-test-job.yml

@@ -78,13 +78,13 @@ jobs:
         - name: runtimeFlavorArgs
           value: '-nativeaot'
 
-      - name: testTreeFilterArg
+      - name: testFilterArg
         value: ''
 
       # Only build GCSimulator tests when the gc-simulator group is specified.
       - ${{ if eq(parameters.testGroup, 'gc-simulator') }}:
-          - name: testTreeFilterArg
-            value: 'tree GC/Scenarios/GCSimulator'
+          - name: testFilterArg
+            value: 'test GC/Scenarios/GC-simulator.csproj'
 
       - template: /eng/pipelines/common/templates/runtimes/native-test-assets-variables.yml
         parameters:
@@ -110,7 +110,7 @@ jobs:
         displayName: Disk Usage before Build
 
     # Build managed test components
-    - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) $(testTreeFilterArg) ci /p:TargetOS=AnyOS
+    - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) $(testFilterArg) ci /p:TargetOS=AnyOS
       displayName: Build managed test components
 
     - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}:

eng/pipelines/common/templates/runtimes/run-test-job.yml

@@ -119,13 +119,13 @@ jobs:
         - name: LogNamePrefix
           value: TestRunLogs_R2R_CG2_HotColdSplitting
 
-    - name: testTreeFilterArg
+    - name: testFilterArg
       value: ''
 
     # Only build GCSimulator tests when the gc-simulator group is specified.
     - ${{ if eq(parameters.testGroup, 'gc-simulator') }}:
-      - name: testTreeFilterArg
-        value: 'tree GC/Scenarios/GCSimulator'
+        - name: testFilterArg
+          value: 'test GC/Scenarios/GC-simulator.csproj'
 
     - template: /eng/pipelines/common/templates/runtimes/native-test-assets-variables.yml
       parameters:
@@ -232,7 +232,7 @@ jobs:
     # and directly unzip them there after download). Unfortunately the logic to copy
     # the native artifacts to the final test folders is dependent on availability of the
     # managed test artifacts. This step also generates the final test execution scripts.
-    - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) copynativeonly $(logRootNameArg)Native $(testTreeFilterArg) $(runtimeFlavorArgs) $(crossgenArg) $(buildConfig) $(archType) $(priorityArg) $(librariesOverrideArg) $(codeFlowEnforcementArg)
+    - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) copynativeonly $(logRootNameArg)Native $(testFilterArg) $(runtimeFlavorArgs) $(crossgenArg) $(buildConfig) $(archType) $(priorityArg) $(librariesOverrideArg) $(codeFlowEnforcementArg)
       displayName: Copy native test components to test output folder
 
 

src/tests/GC/API/Frozen/Frozen.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Xunit;
 namespace HelloFrozenSegment
 {
     using System;
@@ -134,9 +135,10 @@ internal class Node
         public int number;
     }
 
-    internal static class Program
+    public static class Program
     {
-        private static unsafe int Main()
+        [Fact]
+        public static unsafe void TestEntryPoint()
         {
             // Regression testing for dotnet/runtime #83027
             Node[] firstArray = new Node[30000000]; 
@@ -180,7 +182,6 @@ private static unsafe int Main()
             GC.Collect();
             Console.WriteLine(root.next.next != null);
             frozenSegment.Release();
-            return 100;
         }
     }
 }

src/tests/GC/API/Frozen/Frozen.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported, GCStressIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' != 'coreclr'">true</CLRTestTargetUnsupported>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>

src/tests/GC/API/GC/Collect.cs

@@ -3,29 +3,32 @@
 // Tests GC.Collect()
 
 using System;
+using Xunit;
 
 public class Test_Collect {
-	public static int Main() {
+    [Fact]
+    public static int TestEntryPoint()
+    {
 
-		Object obj1 = new Object();
-		int[] array = new int[25];
-		
-		int gen1 = GC.GetGeneration(array);
+        Object obj1 = new Object();
+        int[] array = new int[25];
+        
+        int gen1 = GC.GetGeneration(array);
 
-		Console.WriteLine("Array is in generation: " + gen1);
-		GC.Collect();
+        Console.WriteLine("Array is in generation: " + gen1);
+        GC.Collect();
 
-		int gen2 = GC.GetGeneration(array);
-		Console.WriteLine("Array is in generation: " + gen2);
+        int gen2 = GC.GetGeneration(array);
+        Console.WriteLine("Array is in generation: " + gen2);
 
-		if(((gen1==2) && (gen2==2)) || (gen2>gen1)) {	 // was already in gen 2!
-			Console.WriteLine("Test for GC.Collect() passed!");
+        if(((gen1==2) && (gen2==2)) || (gen2>gen1)) {    // was already in gen 2!
+            Console.WriteLine("Test for GC.Collect() passed!");
             return 100;
-		}
+        }
 
-		else {
-			Console.WriteLine("Test for GC.Collect() failed!");
+        else {
+            Console.WriteLine("Test for GC.Collect() failed!");
             return 1;
-		}
-	}
+        }
+    }
 }

src/tests/GC/API/GC/Collect.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for GCStressIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>

src/tests/GC/API/GC/Collect0.cs

@@ -3,9 +3,11 @@
 // Tests GC.Collect(0)
 
 using System;
+using Xunit;
 
 public class Test_Collect0 {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 
 		int[] array = new int[25];
 		int agen1 = GC.GetGeneration(array);

src/tests/GC/API/GC/Collect0.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for GCStressIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>

src/tests/GC/API/GC/Collect1.cs

@@ -4,10 +4,12 @@
 // Tests GC.Collect(1)
 
 using System;
+using Xunit;
 
 public class Test_Collect1
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int[] array = new int[25];
         int agen1 = GC.GetGeneration(array);

src/tests/GC/API/GC/Collect1.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for GCStressIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>

src/tests/GC/API/GC/Collect_Aggressive.cs

@@ -4,10 +4,12 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 public class AggressiveCollect
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         long before = CreateGarbage();
         GC.Collect(2, GCCollectionMode.Aggressive, blocking: true, compacting: true);

src/tests/GC/API/GC/Collect_Aggressive.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- Consider enable it for Mono whenever the implementation is ready -->
     <!-- https://github.com/dotnet/runtime/issues/73167 -->
     <CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' != 'coreclr'">true</CLRTestTargetUnsupported>

src/tests/GC/API/GC/Collect_Aggressive_MultipleParameters.cs

@@ -4,10 +4,12 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 public class AggressiveCollect_MultipleParameters
 {
-    public static int Main()
+    [Fact]
+    public static void TestEntryPoint()
     {
         long before = CreateGarbage();
         GC.Collect(2, GCCollectionMode.Aggressive, blocking: true, compacting: true);
@@ -55,7 +57,6 @@ public static int Main()
         }
 
         // If we got this far, we have successfully executed all the tests. 
-        return 100;
     }
 
     [MethodImpl(MethodImplOptions.NoInlining)]

src/tests/GC/API/GC/Collect_Aggressive_MultipleParameters.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- Consider enable it for Mono whenever the implementation is ready -->
     <!-- https://github.com/dotnet/runtime/issues/73167 -->
     <CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' != 'coreclr'">true</CLRTestTargetUnsupported>

src/tests/GC/API/GC/Collect_Default_1.csproj

@@ -1,7 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
+    <!-- Test needs explicit Main as it uses command-line parameters -->
+    <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
     <CLRTestExecutionArguments>0</CLRTestExecutionArguments>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

src/tests/GC/API/GC/Collect_Default_2.csproj

@@ -1,7 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
+    <!-- Test needs explicit Main as it uses command-line parameters -->
+    <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
     <CLRTestExecutionArguments>1</CLRTestExecutionArguments>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

src/tests/GC/API/GC/Collect_Default_3.csproj

@@ -1,7 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
+    <!-- Test needs explicit Main as it uses command-line parameters -->
+    <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
     <CLRTestExecutionArguments>2</CLRTestExecutionArguments>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

src/tests/GC/API/GC/Collect_Forced_1.csproj

@@ -1,7 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for GCStressIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
+    <!-- Test needs explicit Main as it uses command-line parameters -->
+    <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
     <CLRTestExecutionArguments>0</CLRTestExecutionArguments>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

src/tests/GC/API/GC/Collect_Forced_2.csproj

@@ -1,7 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for GCStressIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
+    <!-- Test needs explicit Main as it uses command-line parameters -->
+    <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
     <CLRTestExecutionArguments>1</CLRTestExecutionArguments>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

src/tests/GC/API/GC/Collect_Forced_3.csproj

@@ -1,7 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for GCStressIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
+    <!-- Test needs explicit Main as it uses command-line parameters -->
+    <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
     <CLRTestExecutionArguments>2</CLRTestExecutionArguments>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

src/tests/GC/API/GC/Collect_Optimized_1.csproj

@@ -1,7 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
+    <!-- Test needs explicit Main as it uses command-line parameters -->
+    <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
     <CLRTestExecutionArguments>0</CLRTestExecutionArguments>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

src/tests/GC/API/GC/Collect_Optimized_2.csproj

@@ -1,6 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
+    <!-- Test needs explicit Main as it uses command-line parameters -->
+    <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
     <CLRTestExecutionArguments>1</CLRTestExecutionArguments>
   </PropertyGroup>
   <PropertyGroup>

src/tests/GC/API/GC/Collect_Optimized_3.csproj

@@ -1,6 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
+    <!-- Test needs explicit Main as it uses command-line parameters -->
+    <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
     <CLRTestExecutionArguments>2</CLRTestExecutionArguments>
   </PropertyGroup>
   <PropertyGroup>

src/tests/GC/API/GC/Collect_fail.cs

@@ -12,10 +12,12 @@
  */
 
 using System;
+using Xunit;
 
 public class Test_Collect_fail
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int[] array = new int[25];
         bool passed = false;

src/tests/GC/API/GC/Collect_fail.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>