Skip to content

Commit 1c20e23

Browse files
authored
Move wasm threading library tests job from runtime-extra-platforms to runtime (#98094)
Only trigger it for wasm-specific changes in PRs, not libraries/illink.
1 parent 9f3a439 commit 1c20e23

File tree

3 files changed

+35
-32
lines changed

3 files changed

+35
-32
lines changed

eng/pipelines/common/templates/wasm-library-tests.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
platforms: []
99
scenarios: ['normal']
1010
shouldContinueOnError: false
11-
shouldRunSmokeOnly: false
11+
shouldRunSmokeOnly: false
1212

1313
jobs:
1414

@@ -39,8 +39,27 @@ jobs:
3939
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm_chrome.containsChange'], true),
4040
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm_specific_except_wbt_dbg.containsChange'], true))
4141
]
42+
# run smoke tests only if:
43+
# - explicitly requested
44+
# - libraries or illink changed and no wasm specific changes
45+
- name: shouldRunSmokeOnlyVar
46+
value: $[
47+
or(
48+
eq('${{ parameters.shouldRunSmokeOnly }}', 'true'),
49+
and(
50+
eq('${{ parameters.shouldRunSmokeOnly }}', 'onLibrariesAndIllinkChanges'),
51+
ne(variables['wasmDarcDependenciesChanged'], true),
52+
or(
53+
eq(dependencies.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'], true),
54+
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true)
55+
),
56+
ne(dependencies.evaluate_paths.outputs['SetPathVars_wasm_chrome.containsChange'], true),
57+
ne(dependencies.evaluate_paths.outputs['SetPathVars_wasm_specific_except_wbt_dbg.containsChange'], true)
58+
)
59+
)
60+
]
4261
- name: _wasmRunSmokeTestsOnlyArg
43-
value: /p:RunSmokeTestsOnly=${{ eq(parameters.shouldRunSmokeOnly, true) }}
62+
value: /p:RunSmokeTestsOnly=$(shouldRunSmokeOnlyVar)
4463
- name: chromeInstallArg
4564
${{ if containsValue(parameters.scenarios, 'wasmtestonbrowser') }}:
4665
value: /p:InstallChromeForTests=true

eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -117,24 +117,6 @@ jobs:
117117
- WasmTestOnBrowser
118118
- WasmTestOnNodeJS
119119

120-
# Library tests with full threading
121-
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
122-
parameters:
123-
platforms:
124-
- browser_wasm
125-
#- browser_wasm_win
126-
nameSuffix: _Threading
127-
extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
128-
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
129-
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
130-
# Always run for runtime-wasm because tests are not run in runtime
131-
alwaysRun: ${{ parameters.isWasmOnlyBuild }}
132-
133-
scenarios:
134-
- WasmTestOnBrowser
135-
#- WasmTestOnNodeJS - this is not supported yet, https://github.com/dotnet/runtime/issues/85592
136-
137-
138120
# EAT Library tests - only run on linux
139121
- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
140122
parameters:

eng/pipelines/runtime.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,20 @@ extends:
521521
scenarios:
522522
- WasmTestOnBrowser
523523

524+
# Library tests with full threading
525+
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
526+
parameters:
527+
platforms:
528+
- browser_wasm
529+
#- browser_wasm_win
530+
nameSuffix: _Threading
531+
extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
532+
alwaysRun: ${{ variables.isRollingBuild }}
533+
shouldRunSmokeOnly: onLibrariesAndIllinkChanges
534+
scenarios:
535+
- WasmTestOnBrowser
536+
#- WasmTestOnNodeJS - this is not supported yet, https://github.com/dotnet/runtime/issues/85592
537+
524538
# EAT Library tests - only run on linux
525539
- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
526540
parameters:
@@ -595,18 +609,6 @@ extends:
595609
alwaysRun: ${{ variables.isRollingBuild }}
596610
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
597611

598-
# Build and Smoke Tests only - Wasm Threading Legs
599-
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
600-
parameters:
601-
platforms:
602-
- browser_wasm
603-
nameSuffix: _Threading_Smoke
604-
extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
605-
shouldRunSmokeOnly: true
606-
alwaysRun: ${{ variables.isRollingBuild }}
607-
scenarios:
608-
- WasmTestOnBrowser
609-
610612
# WASI/WASM
611613

612614
- template: /eng/pipelines/common/templates/wasm-library-tests.yml

0 commit comments

Comments
 (0)