Skip to content

Commit ec42368

Browse files
pavelsavarapavelsavara
committed
more
1 parent 93010da commit ec42368

29 files changed

+179
-92
lines changed

‎eng/pipelines/common/templates/additional-steps-then-helix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
targetRid: ''
1515
testRunNamePrefixSuffix: ''
1616
testScope: 'innerloop' # innerloop | outerloop | all
17-
scenarios: ['normal']
17+
scenarios: ['WasmTestOnV8']
1818

1919
steps:
2020
- ${{ if ne(parameters.additionalSteps, '') }}:

‎eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ parameters:
1515
runtimeVariant: 'monointerpreter'
1616
llvmAotStepContainer: ''
1717
scenarios:
18-
- normal
18+
- WasmTestOnV8
1919
variables: {}
2020
pool: ''
2121
dependsOn: []

‎eng/pipelines/common/templates/runtimes/run-test-job.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -334,13 +334,13 @@ jobs:
334334
${{ if eq(parameters.runtimeFlavor, 'mono') }}:
335335
# tiered compilation isn't done on mono yet
336336
scenarios:
337-
- normal
337+
- WasmTestOnV8
338338
${{ elseif eq(variables['Build.Reason'], 'PullRequest') }}:
339339
scenarios:
340340
- no_tiered_compilation
341341
${{ else }}:
342342
scenarios:
343-
- normal
343+
- WasmTestOnV8
344344
- no_tiered_compilation
345345

346346
${{ if in(parameters.testGroup, 'jitstress') }}:
@@ -516,11 +516,11 @@ jobs:
516516
${{ if in(parameters.testGroup, 'gc-longrunning') }}:
517517
longRunningGcTests: true
518518
scenarios:
519-
- normal
519+
- WasmTestOnV8
520520
${{ if in(parameters.testGroup, 'gc-simulator') }}:
521521
gcSimulatorTests: true
522522
scenarios:
523-
- normal
523+
- WasmTestOnV8
524524
${{ if in(parameters.testGroup, 'gc-standalone') }}:
525525
scenarios:
526526
- gcstandalone

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ jobs:
3232
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
3333
scenarios:
3434
- ${{ if eq(platform, 'browser_wasm_win') }}:
35-
- WasmTestOnBrowser
35+
- WasmTestOnChrome
3636
- ${{ if ne(platform, 'browser_wasm_win') }}:
37-
- normal
37+
- WasmTestOnV8

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

+9-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parameters:
66
isWasmOnlyBuild: false
77
nameSuffix: ''
88
platforms: []
9-
scenarios: ['normal']
9+
scenarios: ['WasmTestOnV8']
1010
shouldContinueOnError: false
1111
shouldRunSmokeOnly: false
1212

@@ -61,12 +61,17 @@ jobs:
6161
- name: _wasmRunSmokeTestsOnlyArg
6262
value: /p:RunSmokeTestsOnly=$(shouldRunSmokeOnlyVar)
6363
- name: chromeInstallArg
64-
${{ if containsValue(parameters.scenarios, 'wasmtestonbrowser') }}:
64+
${{ if containsValue(parameters.scenarios, 'WasmTestOnChrome') }}:
6565
value: /p:InstallChromeForTests=true
6666
${{ else }}:
6767
value: ''
68+
- name: firefoxInstallArg
69+
${{ if containsValue(parameters.scenarios, 'WasmTestOnFirefox') }}:
70+
value: /p:InstallFirefoxForTests=true
71+
${{ else }}:
72+
value: ''
6873
- name: v8InstallArg
69-
${{ if containsValue(parameters.scenarios, 'normal') }}:
74+
${{ if containsValue(parameters.scenarios, 'WasmTestOnV8') }}:
7075
value: /p:InstallV8ForTests=true
7176
${{ else }}:
7277
value: ''
@@ -75,7 +80,7 @@ jobs:
7580
isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
7681
testGroup: innerloop
7782
nameSuffix: LibraryTests${{ parameters.nameSuffix }}
78-
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=$(_hostedOs) $(_wasmRunSmokeTestsOnlyArg) $(chromeInstallArg) $(v8InstallArg) ${{ parameters.extraBuildArgs }}
83+
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=$(_hostedOs) $(_wasmRunSmokeTestsOnlyArg) $(chromeInstallArg) $(firefoxInstallArg) $(v8InstallArg) ${{ parameters.extraBuildArgs }}
7984
timeoutInMinutes: 240
8085
# if !alwaysRun, then:
8186
# if this is runtime-wasm (isWasmOnlyBuild):

‎eng/pipelines/coreclr/superpmi-collect.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ extends:
340340
dependsOnTestBuildConfiguration: Release
341341
dependsOnTestArchitecture: x64
342342
scenarios:
343-
- normal
343+
- WasmTestOnV8
344344
SuperPmiCollect: true
345345
SuperPmiCollectionName: libraries_tests
346346
unifiedArtifactsName: BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_Checked

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

+10-9
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ jobs:
8989
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
9090
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
9191
scenarios:
92-
- normal
93-
- WasmTestOnBrowser
92+
- WasmTestOnV8
93+
- WasmTestOnChrome
9494

9595
# this only runs on the extra pipeline
9696
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
@@ -114,7 +114,7 @@ jobs:
114114
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
115115
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
116116
scenarios:
117-
- WasmTestOnBrowser
117+
- WasmTestOnChrome
118118
- WasmTestOnNodeJS
119119

120120
# EAT Library tests - only run on linux
@@ -183,7 +183,7 @@ jobs:
183183
shouldContinueOnError: ${{ not(parameters.isWasmOnlyBuild) }}
184184
alwaysRun: ${{ variables.isRollingBuild }}
185185
scenarios:
186-
- normal
186+
- WasmTestOnV8
187187

188188
# Hybrid Globalization tests
189189
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
@@ -197,8 +197,9 @@ jobs:
197197
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
198198
alwaysRun: true
199199
scenarios:
200-
- normal
201-
- WasmTestOnBrowser
200+
- WasmTestOnV8
201+
- WasmTestOnChrome
202+
- WasmTestOnFirefox
202203
- WasmTestOnNodeJS
203204

204205
# Hybrid Globalization AOT tests
@@ -214,8 +215,8 @@ jobs:
214215
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
215216
alwaysRun: true
216217
scenarios:
217-
- normal
218-
- WasmTestOnBrowser
218+
- WasmTestOnV8
219+
- WasmTestOnChrome
219220
- WasmTestOnNodeJS
220221

221222
- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}:
@@ -321,4 +322,4 @@ jobs:
321322
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
322323
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
323324
scenarios:
324-
- normal
325+
- WasmTestOnV8

‎eng/pipelines/libraries/outerloop-mono.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ extends:
6565
- template: /eng/pipelines/libraries/helix.yml
6666
parameters:
6767
scenarios:
68-
- normal
68+
- WasmTestOnV8
6969
testScope: outerloop
7070
creator: dotnet-bot
7171
testRunNamePrefixSuffix: Mono_$(_BuildConfig)

‎eng/pipelines/runtime-sanitized.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ extends:
4545
creator: dotnet-bot
4646
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
4747
scenarios:
48-
- normal
48+
- WasmTestOnV8
4949
- no_tiered_compilation
5050
extraVariablesTemplates:
5151
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
@@ -80,7 +80,7 @@ extends:
8080
creator: dotnet-bot
8181
testRunNamePrefixSuffix: Libraries_$(_BuildConfig)
8282
scenarios:
83-
- normal
83+
- WasmTestOnV8
8484

8585
#
8686
# Build the whole product with CoreCLR and run libraries tests with AddressSanitizer
@@ -112,7 +112,7 @@ extends:
112112
creator: dotnet-bot
113113
testRunNamePrefixSuffix: Libraries_$(_BuildConfig)
114114
scenarios:
115-
- normal
115+
- WasmTestOnV8
116116

117117
#
118118
# NativeAOT release build and smoke tests with AddressSanitizer

‎eng/pipelines/runtime.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -823,8 +823,9 @@ extends:
823823
alwaysRun: ${{ variables.isRollingBuild }}
824824
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
825825
scenarios:
826-
- normal
827-
- WasmTestOnBrowser
826+
- WasmTestOnV8
827+
- WasmTestOnChrome
828+
- WasmTestOnFirefox
828829

829830
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
830831
parameters:
@@ -833,7 +834,7 @@ extends:
833834
alwaysRun: ${{ variables.isRollingBuild }}
834835
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
835836
scenarios:
836-
- WasmTestOnBrowser
837+
- WasmTestOnChrome
837838

838839
# Library tests with full threading
839840
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
@@ -846,7 +847,8 @@ extends:
846847
alwaysRun: ${{ variables.isRollingBuild }}
847848
shouldRunSmokeOnly: onLibrariesAndIllinkChanges
848849
scenarios:
849-
- WasmTestOnBrowser
850+
- WasmTestOnChrome
851+
- WasmTestOnFirefox
850852
#- WasmTestOnNodeJS - this is not supported yet, https://github.com/dotnet/runtime/issues/85592
851853

852854
# EAT Library tests - only run on linux
@@ -935,7 +937,7 @@ extends:
935937
shouldRunSmokeOnly: true
936938
alwaysRun: ${{ variables.isRollingBuild }}
937939
scenarios:
938-
- normal
940+
- WasmTestOnV8
939941

940942
- template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml
941943
parameters:

‎eng/testing/ChromeVersions.props

+2
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@
88
<win_ChromeRevision>1250580</win_ChromeRevision>
99
<win_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/1250586</win_ChromeBaseSnapshotUrl>
1010
<win_V8Version>12.3.219</win_V8Version>
11+
<linux_FirefoxRevision>124.0.2</FirefoxRevision>
12+
<linux_GeckoDriverRevision>0.34.0</GeckoDriverRevision>
1113
</PropertyGroup>
1214
</Project>

‎eng/testing/WasmRunnerAOTTemplate.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ else
2727
fi
2828

2929
if [[ -z "$XHARNESS_COMMAND" ]]; then
30-
if [[ "$SCENARIO" == "WasmTestOnBrowser" || "$SCENARIO" == "wasmtestonbrowser" ]]; then
30+
if [[ "$SCENARIO" == "WasmTestOnFirefox" || "$SCENARIO" == "wasmtestonfirefox" ]]; then
31+
XHARNESS_COMMAND="test-browser --browser=Firefox"
32+
elif [[ "$SCENARIO" == "WasmTestOnChrome" || "$SCENARIO" == "wasmtestonchrome" ]]; then
3133
XHARNESS_COMMAND="test-browser"
3234
else
3335
XHARNESS_COMMAND="test"

‎eng/testing/WasmRunnerTemplate.cmd

+10-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,14 @@ if [%XHARNESS_CLI_PATH%] NEQ [] (
2727
)
2828

2929
if [%XHARNESS_COMMAND%] == [] (
30-
if /I [%SCENARIO%]==[WasmTestOnBrowser] (
30+
if /I [%SCENARIO%]==[WasmTestOnChrome] (
3131
set XHARNESS_COMMAND=test-browser
3232
) else (
33-
set XHARNESS_COMMAND=test
33+
if /I [%SCENARIO%]==[WasmTestOnFirefox] (
34+
set "XHARNESS_COMMAND=test-browser --browser=Firefox"
35+
) else (
36+
set XHARNESS_COMMAND=test
37+
)
3438
)
3539
)
3640

@@ -56,8 +60,10 @@ if /I [%XHARNESS_COMMAND%] == [test] (
5660
)
5761
)
5862
) else (
59-
if [%BROWSER_PATH%] == [] if not [%HELIX_CORRELATION_PAYLOAD%] == [] (
60-
set "BROWSER_PATH=--browser-path^=%HELIX_CORRELATION_PAYLOAD%\chrome-win\chrome.exe"
63+
if /I [%SCENARIO%] == [WasmTestOnChrome] (
64+
if [%BROWSER_PATH%] == [] if not [%HELIX_CORRELATION_PAYLOAD%] == [] (
65+
set "BROWSER_PATH=--browser-path^=%HELIX_CORRELATION_PAYLOAD%\chrome-win\chrome.exe"
66+
)
6167
)
6268
if [%JS_ENGINE_ARGS%] == [] (
6369
set "JS_ENGINE_ARGS=--browser-arg^=--js-flags^=--stack-trace-limit^=1000"

‎eng/testing/WasmRunnerTemplate.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ else
2626
fi
2727

2828
if [[ -z "$XHARNESS_COMMAND" ]]; then
29-
if [[ "$SCENARIO" == "WasmTestOnBrowser" || "$SCENARIO" == "wasmtestonbrowser" ]]; then
29+
if [[ "$SCENARIO" == "WasmTestOnFirefox" || "$SCENARIO" == "wasmtestonfirefox" ]]; then
30+
XHARNESS_COMMAND="test-browser --browser=Firefox"
31+
elif [[ "$SCENARIO" == "WasmTestOnChrome" || "$SCENARIO" == "wasmtestonchrome" ]]; then
3032
XHARNESS_COMMAND="test-browser"
3133
else
3234
XHARNESS_COMMAND="test"

‎eng/testing/helix-extension-example.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
2-
<PropertyGroup Condition="'$(IsRunningLibraryTests)' == 'true' and '$(Scenario)' == 'WasmTestOnBrowser'">
2+
<PropertyGroup Condition="'$(IsRunningLibraryTests)' == 'true' and '$(Scenario)' == 'WasmTestOnChrome'">
33
<HelixExtensionTargets>$(HelixExtensionTargets);_AddHelixCrypoItems</HelixExtensionTargets>
44
<_CryptoProjectName>System.Security.Cryptography.Tests</_CryptoProjectName>
55
</PropertyGroup>

‎eng/testing/tests.browser.targets

+9-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
<!-- '/.dockerenv' - is to check if this is running in a codespace -->
2727
<InstallChromeForTests Condition="'$(InstallChromeForTests)' == '' and
2828
('$(ContinuousIntegrationBuild)' != 'true' or Exists('/.dockerenv')) and
29-
'$(Scenario)' == 'WasmTestOnBrowser'">true</InstallChromeForTests>
29+
'$(Scenario)' == 'WasmTestOnChrome'">true</InstallChromeForTests>
30+
<InstallFirefoxForTests Condition="'$(InstallFirefoxForTests)' == '' and
31+
('$(ContinuousIntegrationBuild)' != 'true' or Exists('/.dockerenv')) and
32+
'$(Scenario)' == 'WasmTestOnFirefox'">true</InstallFirefoxForTests>
3033
<InstallV8ForTests Condition="'$(InstallV8ForTests)' == '' and
3134
('$(ContinuousIntegrationBuild)' == 'true' or Exists('/.dockerenv')) and
3235
($([MSBuild]::IsOSPlatform('windows')) or $([MSBuild]::IsOSPlatform('linux')))"
@@ -55,6 +58,9 @@
5558
<_WasmBrowserPathForTests Condition="'$(BROWSER_PATH_FOR_TESTS)' != ''">$(BROWSER_PATH_FOR_TESTS)</_WasmBrowserPathForTests>
5659
<_WasmBrowserPathForTests Condition="'$(_WasmBrowserPathForTests)' == '' and '$(InstallChromeForTests)' == 'true'">$(ChromeBinaryPath)</_WasmBrowserPathForTests>
5760

61+
<_WasmBrowserPathForTests Condition="'$(BROWSER_PATH_FOR_TESTS)' != ''">$(BROWSER_PATH_FOR_TESTS)</_WasmBrowserPathForTests>
62+
<_WasmBrowserPathForTests Condition="'$(_WasmBrowserPathForTests)' == '' and '$(InstallFirefoxForTests)' == 'true'">$(FirefoxBinaryPath)</_WasmBrowserPathForTests>
63+
5864
<_WasmJSEnginePathForTests Condition="'$(V8_PATH_FOR_TESTS)' != ''">$(V8_PATH_FOR_TESTS)</_WasmJSEnginePathForTests>
5965
<_WasmJSEnginePathForTests Condition="'$(_WasmJSEnginePathForTests)' == '' and '$(InstallV8ForTests)' == 'true'">$(V8BinaryPath)</_WasmJSEnginePathForTests>
6066
</PropertyGroup>
@@ -252,13 +258,15 @@
252258
<RunScriptCommands Include="if [[ &quot;$SCENARIO&quot; == &quot;WasmTestOnNodeJS&quot; || &quot;$SCENARIO&quot; == &quot;wasmtestonnodejs&quot; ]]; then npm ci; fi" />
253259

254260
<SetScriptCommands Condition="'$(InstallChromeForTests)' == 'true' and '$(ChromeDriverBinaryPath)' != ''" Include="export PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(ChromeDriverBinaryPath)))" />
261+
<SetScriptCommands Condition="'$(InstallFirefoxForTests)' == 'true' and '$(GeckoDriverBinaryPath)' != ''" Include="export PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(GeckoDriverBinaryPath)))" />
255262
<SetScriptCommands Condition="'$(IsBrowserWasmProject)' == 'true'" Include="export RuntimeIdentifier=browser-wasm" />
256263
</ItemGroup>
257264
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
258265
<SetScriptCommands Include="if /I [%SCENARIO%]==[WasmTestOnNodeJS] ( set &quot;WasmXHarnessMonoArgs=%WasmXHarnessMonoArgs% --setenv=NPM_MODULES^=$(NodeNpmModuleString)&quot; )" />
259266
<RunScriptCommands Include="if /I [%SCENARIO%]==[WasmTestOnNodeJS] ( call npm ci )" />
260267

261268
<SetScriptCommands Condition="'$(InstallChromeForTests)' == 'true' and '$(ChromeDriverBinaryPath)' != ''" Include="set PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(ChromeDriverBinaryPath)))" />
269+
<SetScriptCommands Condition="'$(InstallFirefoxForTests)' == 'true' and '$(GeckoDriverBinaryPath)' != ''" Include="set PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(GeckoDriverBinaryPath)))" />
262270
<SetScriptCommands Condition="'$(IsBrowserWasmProject)' == 'true'" Include="set RuntimeIdentifier=browser-wasm" />
263271
</ItemGroup>
264272
</Target>

0 commit comments

Comments
 (0)