Skip to content

Commit 4cf1383

Browse files
authored
[wasm] CI: Run all EAT tests on runtime pipeline (#75516)
- this regressed recently, to run only smoke tests
1 parent 9e128de commit 4cf1383

3 files changed

Lines changed: 11 additions & 8 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
nameSuffix: ''
99
platforms: []
1010
runAOT: false
11-
runSmokeOnlyArg: ''
11+
shouldRunSmokeOnly: false
1212
shouldContinueOnError: false
1313

1414
jobs:
@@ -28,7 +28,7 @@ jobs:
2828
extraBuildArgs: /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=${{ parameters.buildAOTOnHelix }} /p:RunAOTCompilation=${{ parameters.runAOT }} ${{ parameters.extraBuildArgs }}
2929
extraHelixArgs: /p:NeedsToBuildWasmAppsOnHelix=true ${{ parameters.extraHelixArgs }}
3030
alwaysRun: ${{ parameters.alwaysRun }}
31-
runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
31+
shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }}
3232
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
3333
scenarios:
3434
- normal
@@ -45,7 +45,7 @@ jobs:
4545
extraBuildArgs: /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=${{ parameters.buildAOTOnHelix }} /p:RunAOTCompilation=${{ parameters.runAOT }} ${{ parameters.extraBuildArgs }}
4646
extraHelixArgs: /p:NeedsToBuildWasmAppsOnHelix=true ${{ parameters.extraHelixArgs }}
4747
alwaysRun: ${{ parameters.alwaysRun }}
48-
runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
48+
shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }}
4949
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
5050
scenarios:
5151
- WasmTestOnBrowser

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ parameters:
77
isWasmOnlyBuild: false
88
nameSuffix: ''
99
platforms: []
10-
runSmokeOnlyArg: ''
1110
scenarios: ['normal']
1211
shouldContinueOnError: false
12+
shouldRunSmokeOnly: false
1313

1414
jobs:
1515

@@ -47,11 +47,13 @@ jobs:
4747
and(
4848
eq(dependencies.evaluate_paths.outputs.SetPathVars_wasm_wbt_or_dbg.containsChange, true),
4949
ne(dependencies.evaluate_paths.outputs.SetPathVars_any_other_than_wasm_wbt_dbg.containsChange, true))
50+
- name: _wasmRunSmokeTestsOnlyArg
51+
value: /p:RunSmokeTestsOnly=${{ eq(parameters.shouldRunSmokeOnly, true) }}
5052
jobParameters:
5153
isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
5254
testGroup: innerloop
5355
nameSuffix: LibraryTests${{ parameters.nameSuffix }}
54-
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=$(_hostedOs) ${{ parameters.runSmokeOnlyArg }} ${{ parameters.extraBuildArgs }}
56+
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=$(_hostedOs) $(_wasmRunSmokeTestsOnlyArg) ${{ parameters.extraBuildArgs }}
5557
timeoutInMinutes: 240
5658
# if !alwaysRun, then:
5759
# if this is runtime-wasm (isWasmOnlyBuild):
@@ -75,5 +77,5 @@ jobs:
7577
7678
creator: dotnet-bot
7779
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
78-
extraHelixArguments: /p:BrowserHost=$(_hostedOs) ${{ parameters.runSmokeOnlyArg }} ${{ parameters.extraHelixArgs }}
80+
extraHelixArguments: /p:BrowserHost=$(_hostedOs) $(_wasmRunSmokeTestsOnlyArg) ${{ parameters.extraHelixArgs }}
7981
scenarios: ${{ parameters.scenarios }}

eng/pipelines/runtime.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ jobs:
397397
- Browser_wasm
398398
nameSuffix: _EAT
399399
runAOT: false
400+
shouldRunSmokeOnly: false
400401
alwaysRun: ${{ variables.isRollingBuild }}
401402

402403
# AOT Library tests
@@ -406,7 +407,7 @@ jobs:
406407
- Browser_wasm
407408
nameSuffix: _AOT
408409
runAOT: true
409-
runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
410+
shouldRunSmokeOnly: true
410411
alwaysRun: ${{ variables.isRollingBuild }}
411412

412413
- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
@@ -415,7 +416,7 @@ jobs:
415416
- Browser_wasm_win
416417
nameSuffix: _AOT
417418
runAOT: true
418-
runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
419+
shouldRunSmokeOnly: true
419420
alwaysRun: ${{ variables.isRollingBuild }}
420421

421422
# Wasm.Build.Tests

0 commit comments

Comments
 (0)