Skip to content

Commit fedf64f

Browse files
radicalradical
authored
[wasm] Re-enable windows wasm AOT tests (#62352)
They had been disabled earlier because of #61721
1 parent 03b2885 commit fedf64f

3 files changed

Lines changed: 95 additions & 82 deletions

File tree

‎eng/pipelines/runtime-manual.yml‎

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -332,47 +332,46 @@ jobs:
332332
eq(variables['isManualOrIsNotPR'], true),
333333
eq(variables['isFullMatrix'], true))
334334
335-
# Disabled due to https://github.com/dotnet/runtime/issues/61721
336-
#- template: /eng/pipelines/common/platform-matrix.yml
337-
#parameters:
338-
#jobTemplate: /eng/pipelines/common/global-build-job.yml
339-
#helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
340-
#buildConfig: release
341-
#runtimeFlavor: mono
342-
#platforms:
343-
#- Browser_wasm_win
344-
#variables:
345-
## map dependencies variables to local variables
346-
#- name: librariesContainsChange
347-
#value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
348-
#- name: monoContainsChange
349-
#value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
350-
#jobParameters:
351-
#testGroup: innerloop
352-
#nameSuffix: Windows_wasm_AOT
353-
#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)
354-
#timeoutInMinutes: 180
355-
#condition: >-
356-
#or(
357-
#eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
358-
#eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
359-
#eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
360-
#eq(variables['isManualOrIsNotPR'], true),
361-
#eq(variables['isFullMatrix'], true))
362-
## extra steps, run tests
363-
#extraStepsTemplate: /eng/pipelines/libraries/helix.yml
364-
#extraStepsParameters:
365-
#creator: dotnet-bot
366-
#testRunNamePrefixSuffix: Mono_$(_BuildConfig)
367-
#extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
368-
#scenarios:
369-
#- normal
370-
#condition: >-
371-
#or(
372-
#eq(variables['librariesContainsChange'], true),
373-
#eq(variables['monoContainsChange'], true),
374-
#eq(variables['isManualOrIsNotPR'], true),
375-
#eq(variables['isFullMatrix'], true))
335+
- template: /eng/pipelines/common/platform-matrix.yml
336+
parameters:
337+
jobTemplate: /eng/pipelines/common/global-build-job.yml
338+
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
339+
buildConfig: release
340+
runtimeFlavor: mono
341+
platforms:
342+
- Browser_wasm_win
343+
variables:
344+
# map dependencies variables to local variables
345+
- name: librariesContainsChange
346+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
347+
- name: monoContainsChange
348+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
349+
jobParameters:
350+
testGroup: innerloop
351+
nameSuffix: Windows_wasm_AOT
352+
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)
353+
timeoutInMinutes: 180
354+
condition: >-
355+
or(
356+
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
357+
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
358+
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
359+
eq(variables['isManualOrIsNotPR'], true),
360+
eq(variables['isFullMatrix'], true))
361+
# extra steps, run tests
362+
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
363+
extraStepsParameters:
364+
creator: dotnet-bot
365+
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
366+
extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
367+
scenarios:
368+
- normal
369+
condition: >-
370+
or(
371+
eq(variables['librariesContainsChange'], true),
372+
eq(variables['monoContainsChange'], true),
373+
eq(variables['isManualOrIsNotPR'], true),
374+
eq(variables['isFullMatrix'], true))
376375
377376
#
378377
# Build for Browser/wasm, with EnableAggressiveTrimming=true

‎eng/pipelines/runtime-staging.yml‎

Lines changed: 38 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -493,47 +493,44 @@ jobs:
493493
# Build Browser_wasm, on windows, and run tests with AOT
494494
#
495495
# Disabled due to https://github.com/dotnet/runtime/issues/61721
496-
#- template: /eng/pipelines/common/platform-matrix.yml
497-
#parameters:
498-
#jobTemplate: /eng/pipelines/common/global-build-job.yml
499-
#helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
500-
#buildConfig: release
501-
#runtimeFlavor: mono
502-
#platforms:
503-
#- Browser_wasm_win
504-
#variables:
505-
## map dependencies variables to local variables
506-
#- name: librariesContainsChange
507-
#value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
508-
#- name: monoContainsChange
509-
#value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
510-
#jobParameters:
511-
#testGroup: innerloop
512-
#nameSuffix: Windows_wasm_AOT
513-
#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)
514-
#timeoutInMinutes: 180
515-
#condition: >-
516-
#or(
517-
#eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
518-
#eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
519-
#eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
520-
#eq(variables['isManualOrIsNotPR'], true),
521-
#eq(variables['isFullMatrix'], true))
522-
## extra steps, run tests
523-
#extraStepsTemplate: /eng/pipelines/libraries/helix.yml
524-
#extraStepsParameters:
525-
#creator: dotnet-bot
526-
#testRunNamePrefixSuffix: Mono_$(_BuildConfig)
527-
#extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
528-
#scenarios:
529-
#- normal
530-
#condition: >-
531-
#or(
532-
#eq(variables['librariesContainsChange'], true),
533-
#eq(variables['monoContainsChange'], true),
534-
#eq(variables['isManualOrIsNotPR'], true),
535-
#eq(variables['isFullMatrix'], true))
536-
496+
- template: /eng/pipelines/common/platform-matrix.yml
497+
parameters:
498+
jobTemplate: /eng/pipelines/common/global-build-job.yml
499+
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
500+
buildConfig: release
501+
runtimeFlavor: mono
502+
platforms:
503+
- Browser_wasm_win
504+
variables:
505+
# map dependencies variables to local variables
506+
- name: librariesContainsChange
507+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
508+
- name: monoContainsChange
509+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
510+
jobParameters:
511+
testGroup: innerloop
512+
nameSuffix: Windows_wasm_AOT
513+
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)
514+
timeoutInMinutes: 180
515+
condition: >-
516+
or(
517+
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
518+
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
519+
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
520+
eq(variables['isFullMatrix'], true))
521+
# extra steps, run tests
522+
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
523+
extraStepsParameters:
524+
creator: dotnet-bot
525+
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
526+
extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
527+
scenarios:
528+
- normal
529+
condition: >-
530+
or(
531+
eq(variables['librariesContainsChange'], true),
532+
eq(variables['monoContainsChange'], true),
533+
eq(variables['isFullMatrix'], true))
537534
538535
#
539536
# Build Browser_wasm, on windows, and run Wasm.Build.Tests

‎src/libraries/tests.proj‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,23 @@
3333
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ValueTuple\tests\System.ValueTuple.Tests.csproj" />
3434
</ItemGroup>
3535

36+
<!-- Wasm aot on windows -->
37+
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' == 'true' and '$(BrowserHost)' == 'Windows'">
38+
<!-- https://github.com/dotnet/runtime/issues/61756 -->
39+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\System.Text.RegularExpressions.Tests.csproj" />
40+
41+
<!-- https://github.com/dotnet/runtime/issues/62363 -->
42+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Collections.Immutable\tests\System.Collections.Immutable.Tests.csproj" />
43+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Collections\tests\System.Collections.Tests.csproj" />
44+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj" />
45+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq.Parallel\tests\System.Linq.Parallel.Tests.csproj" />
46+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.TypeExtensions\tests\System.Reflection.TypeExtensions.Tests.csproj" />
47+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj" />
48+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn4.0.Tests.csproj" />
49+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj" />
50+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ValueTuple\tests\System.ValueTuple.Tests.csproj" />
51+
</ItemGroup>
52+
3653
<!-- Projects that don't support code coverage measurement. -->
3754
<ItemGroup Condition="'$(Coverage)' == 'true'">
3855
<ProjectExclusions Include="$(CommonTestPath)Common.Tests.csproj" />

0 commit comments

Comments
 (0)