Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 5, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
098fc9e
[wasm] Re-enable windows wasm AOT tests
radical Dec 3, 2021
4afead9
Fix build to run for runtime-manual
radical Dec 3, 2021
597b65e
[wasm] Disable failing AOT tests
radical Dec 3, 2021
7d3a3c4
Add more failing AOT tests
radical Dec 4, 2021
d22bbe0
fix path separators
radical Dec 4, 2021
3ec55e8
Merge branch 'main' into enable-windows-aot
radical Dec 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 40 additions & 41 deletions eng/pipelines/runtime-manual.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
79 changes: 38 additions & 41 deletions eng/pipelines/runtime-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 17 additions & 0 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down