[wasm] Re-enable windows wasm AOT tests (#62352)

They had been disabled earlier because of #61721
dotnet · Dec 5, 2021 · fedf64f · fedf64f
1 parent 03b2885
commit fedf64f
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 82 deletions.
diff --git a/eng/pipelines/runtime-manual.yml b/eng/pipelines/runtime-manual.yml
@@ -332,47 +332,46 @@ jobs:
           eq(variables['isManualOrIsNotPR'], true),
           eq(variables['isFullMatrix'], true))
 
-# Disabled due to https://github.com/dotnet/runtime/issues/61721
-#- template: /eng/pipelines/common/platform-matrix.yml
-  #parameters:
-    #jobTemplate: /eng/pipelines/common/global-build-job.yml
-    #helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
-    #buildConfig: release
-    #runtimeFlavor: mono
-    #platforms:
-    #- Browser_wasm_win
-    #variables:
-      ## map dependencies variables to local variables
-      #- name: librariesContainsChange
-        #value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-      #- name: monoContainsChange
-        #value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
-    #jobParameters:
-      #testGroup: innerloop
-      #nameSuffix: Windows_wasm_AOT
-      #buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
-      #timeoutInMinutes: 180
-      #condition: >-
-        #or(
-          #eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
-          #eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
-          #eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
-          #eq(variables['isManualOrIsNotPR'], true),
-          #eq(variables['isFullMatrix'], true))
-      ## extra steps, run tests
-      #extraStepsTemplate: /eng/pipelines/libraries/helix.yml
-      #extraStepsParameters:
-        #creator: dotnet-bot
-        #testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-        #extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
-        #scenarios:
-        #- normal
-        #condition: >-
-          #or(
-          #eq(variables['librariesContainsChange'], true),
-          #eq(variables['monoContainsChange'], true),
-          #eq(variables['isManualOrIsNotPR'], true),
-          #eq(variables['isFullMatrix'], true))
+- template: /eng/pipelines/common/platform-matrix.yml
+  parameters:
+    jobTemplate: /eng/pipelines/common/global-build-job.yml
+    helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+    buildConfig: release
+    runtimeFlavor: mono
+    platforms:
+    - Browser_wasm_win
+    variables:
+      # map dependencies variables to local variables
+      - name: librariesContainsChange
+        value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
+      - name: monoContainsChange
+        value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
+    jobParameters:
+      testGroup: innerloop
+      nameSuffix: Windows_wasm_AOT
+      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
+      timeoutInMinutes: 180
+      condition: >-
+        or(
+          eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
+          eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
+          eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
+          eq(variables['isManualOrIsNotPR'], true),
+          eq(variables['isFullMatrix'], true))
+      # extra steps, run tests
+      extraStepsTemplate: /eng/pipelines/libraries/helix.yml
+      extraStepsParameters:
+        creator: dotnet-bot
+        testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+        extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
+        scenarios:
+        - normal
+        condition: >-
+          or(
+          eq(variables['librariesContainsChange'], true),
+          eq(variables['monoContainsChange'], true),
+          eq(variables['isManualOrIsNotPR'], true),
+          eq(variables['isFullMatrix'], true))
 
 #
 # Build for Browser/wasm, with EnableAggressiveTrimming=true

diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml
@@ -493,47 +493,44 @@ jobs:
 # Build Browser_wasm, on windows, and run tests with AOT
 #
 # Disabled due to https://github.com/dotnet/runtime/issues/61721
-#- template: /eng/pipelines/common/platform-matrix.yml
-  #parameters:
-    #jobTemplate: /eng/pipelines/common/global-build-job.yml
-    #helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
-    #buildConfig: release
-    #runtimeFlavor: mono
-    #platforms:
-    #- Browser_wasm_win
-    #variables:
-      ## map dependencies variables to local variables
-      #- name: librariesContainsChange
-        #value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-      #- name: monoContainsChange
-        #value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
-    #jobParameters:
-      #testGroup: innerloop
-      #nameSuffix: Windows_wasm_AOT
-      #buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
-      #timeoutInMinutes: 180
-      #condition: >-
-        #or(
-          #eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
-          #eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
-          #eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
-          #eq(variables['isManualOrIsNotPR'], true),
-          #eq(variables['isFullMatrix'], true))
-      ## extra steps, run tests
-      #extraStepsTemplate: /eng/pipelines/libraries/helix.yml
-      #extraStepsParameters:
-        #creator: dotnet-bot
-        #testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-        #extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
-        #scenarios:
-        #- normal
-        #condition: >-
-          #or(
-          #eq(variables['librariesContainsChange'], true),
-          #eq(variables['monoContainsChange'], true),
-          #eq(variables['isManualOrIsNotPR'], true),
-          #eq(variables['isFullMatrix'], true))
-
+- template: /eng/pipelines/common/platform-matrix.yml
+  parameters:
+    jobTemplate: /eng/pipelines/common/global-build-job.yml
+    helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+    buildConfig: release
+    runtimeFlavor: mono
+    platforms:
+    - Browser_wasm_win
+    variables:
+      # map dependencies variables to local variables
+      - name: librariesContainsChange
+        value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
+      - name: monoContainsChange
+        value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
+    jobParameters:
+      testGroup: innerloop
+      nameSuffix: Windows_wasm_AOT
+      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
+      timeoutInMinutes: 180
+      condition: >-
+        or(
+          eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
+          eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
+          eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
+          eq(variables['isFullMatrix'], true))
+      # extra steps, run tests
+      extraStepsTemplate: /eng/pipelines/libraries/helix.yml
+      extraStepsParameters:
+        creator: dotnet-bot
+        testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+        extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
+        scenarios:
+        - normal
+        condition: >-
+          or(
+          eq(variables['librariesContainsChange'], true),
+          eq(variables['monoContainsChange'], true),
+          eq(variables['isFullMatrix'], true))
 
 #
 # Build Browser_wasm, on windows, and run Wasm.Build.Tests

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
@@ -33,6 +33,23 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ValueTuple\tests\System.ValueTuple.Tests.csproj" />
   </ItemGroup>
 
+  <!-- Wasm aot on windows -->
+  <ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' == 'true' and '$(BrowserHost)' == 'Windows'">
+    <!-- https://github.com/dotnet/runtime/issues/61756 -->
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\System.Text.RegularExpressions.Tests.csproj" />
+
+    <!-- https://github.com/dotnet/runtime/issues/62363 -->
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Collections.Immutable\tests\System.Collections.Immutable.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Collections\tests\System.Collections.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq.Parallel\tests\System.Linq.Parallel.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.TypeExtensions\tests\System.Reflection.TypeExtensions.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn4.0.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ValueTuple\tests\System.ValueTuple.Tests.csproj" />
+  </ItemGroup>
+
   <!-- Projects that don't support code coverage measurement. -->
   <ItemGroup Condition="'$(Coverage)' == 'true'">
     <ProjectExclusions Include="$(CommonTestPath)Common.Tests.csproj" />