Add gcServer legs to stand-alone (#56575)

* Add gcServer legs to stand-alone * only run innerloop for gc-standalone * fix the testenvironment
dotnet · Jul 30, 2021 · d292413 · d292413
1 parent 72f8c04
commit d292413
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml
@@ -489,6 +489,9 @@ jobs:
         ${{ if in(parameters.testGroup, 'gc-standalone') }}:
           scenarios:
           - gcstandalone
+        ${{ if in(parameters.testGroup, 'gc-standalone-server') }}:
+          scenarios:
+          - gcstandaloneserver
         ${{ if in(parameters.testGroup, 'jitelthookenabled') }}:
           scenarios:
           - jitelthookenabled

diff --git a/eng/pipelines/coreclr/gc-standalone.yml b/eng/pipelines/coreclr/gc-standalone.yml
@@ -47,3 +47,19 @@ jobs:
       testGroup: gc-standalone
       displayNameArgs: GCStandAlone
       liveLibrariesBuildConfig: Release
+
+- template: /eng/pipelines/common/platform-matrix.yml
+  parameters:
+    jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
+    buildConfig: checked
+    platforms:
+    - Linux_arm64
+    - Linux_x64
+    - windows_arm64
+    - windows_x64
+    helixQueueGroup: ci
+    helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
+    jobParameters:
+      testGroup: gc-standalone-server
+      displayNameArgs: GCStandAloneServer
+      liveLibrariesBuildConfig: Release
diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
@@ -130,7 +130,7 @@ jobs:
 
     # 'innerloop' and 'clrinterpreter' jobs run the Priority 0 tests; everything else runs the Priority 1 tests.
     # 'gc-standalone' is forced to run pri0 as well to start with. 
-    - ${{ if and(ne(parameters.testGroup, 'innerloop'), ne(parameters.testGroup, 'clrinterpreter'), ne(parameters.testGroup, 'gc-standalone')) }}:
+    - ${{ if and(ne(parameters.testGroup, 'innerloop'), ne(parameters.testGroup, 'clrinterpreter'), ne(parameters.testGroup, 'gc-standalone'), ne(parameters.testGroup, 'gc-standalone-server') ) }}:
       - ${{ if ne(parameters.osGroup, 'windows') }}:
         - name: priorityArg
           value: 'priority1'

diff --git a/src/tests/Common/testenvironment.proj b/src/tests/Common/testenvironment.proj
@@ -39,6 +39,7 @@
       COMPlus_ForceRelocs;
       COMPlus_GCStress;
       COMPlus_GCName;
+      COMPlus_gcServer;
       COMPlus_HeapVerify;
       COMPlus_JITMinOpts;
       COMPlus_JitELTHookEnabled;
@@ -158,6 +159,8 @@
     <TestEnvironment Include="fullpgo" TieredPGO="1" TieredCompilation="1" TC_QuickJitForLoops="1" ReadyToRun="0"/>
     <TestEnvironment Include="gcstandalone" Condition="'$(TargetsWindows)' == 'true'" GCName="clrgc.dll"/>
     <TestEnvironment Include="gcstandalone" Condition="'$(TargetsWindows)' != 'true'" GCName="libclrgc.so"/>
+    <TestEnvironment Include="gcstandaloneserver" Condition="'$(TargetsWindows)' == 'true'" gcServer="1" GCName="clrgc.dll"/>
+    <TestEnvironment Include="gcstandaloneserver" Condition="'$(TargetsWindows)' != 'true'" gcServer="1" GCName="libclrgc.so"/>
   </ItemGroup>
 
   <!-- We use target batching on the COMPlusVariable items to iterate over the all COMPlus_* environment variables