Skip to content

Commit 9068070

Browse files
pavelsavaramaraf
andauthored
[browser] rename WasmTestOnChrome (#101140)
Co-authored-by: Marek Fišera <mara@neptuo.com>
1 parent 6d3a31c commit 9068070

39 files changed

+145
-296
lines changed

.github/workflows/bump-chrome-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: >-
2828
make -C src/mono/wasm build-tasks &&
2929
PATH=$PWD/.dotnet:$PATH dotnet build eng/testing/bump-chrome-version.proj -p:Configuration=Release &&
30-
git add eng/testing/ChromeVersions.props &&
30+
git add eng/testing/BrowserVersions.props &&
3131
cat eng/testing/bump-chrome-pr.env >> "$GITHUB_ENV"
3232
3333
- name: Check for changes

eng/pipelines/common/evaluate-default-paths.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
_const_paths:
88
_wasm_specific_only: [
99
eng/testing/bump-chrome-version.proj
10-
eng/testing/ChromeVersions.props
10+
eng/testing/BrowserVersions.props
1111
eng/testing/WasmRunner*
1212
eng/testing/WasiRunner*
1313
eng/testing/scenarios/BuildWasiAppsJobsList.txt
@@ -58,7 +58,7 @@ parameters:
5858
]
5959
_wasm_chrome: [
6060
eng/testing/bump-chrome-version.proj
61-
eng/testing/ChromeVersions.props
61+
eng/testing/BrowserVersions.props
6262
]
6363
_perf_pipeline_specific_only: [
6464
eng/pipelines/runtime-wasm-perf.yml

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ jobs:
3131
shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }}
3232
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
3333
scenarios:
34-
- ${{ if eq(platform, 'browser_wasm_win') }}:
35-
- WasmTestOnBrowser
36-
- ${{ if ne(platform, 'browser_wasm_win') }}:
34+
- ${{ if eq(platform, 'browser_wasm') }}:
3735
- normal
36+
- ${{ if eq(platform, 'browser_wasm_win') }}:
37+
- WasmTestOnChrome
38+
- ${{ if or(eq(platform, 'wasi_wasm_win'), eq(platform, 'wasi_wasm')) }}:
39+
- WasmTestOnWasmtime

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ 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: ''

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
9191
scenarios:
9292
- normal
93-
- WasmTestOnBrowser
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
@@ -198,7 +198,7 @@ jobs:
198198
alwaysRun: true
199199
scenarios:
200200
- normal
201-
- WasmTestOnBrowser
201+
- WasmTestOnChrome
202202
- WasmTestOnNodeJS
203203

204204
# Hybrid Globalization AOT tests
@@ -215,7 +215,7 @@ jobs:
215215
alwaysRun: true
216216
scenarios:
217217
- normal
218-
- WasmTestOnBrowser
218+
- WasmTestOnChrome
219219
- WasmTestOnNodeJS
220220

221221
- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}:

eng/pipelines/runtime-wasm-perf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pr:
1616
- eng/pipelines/coreclr/templates/run-perf*
1717
- eng/pipelines/coreclr/templates/run-scenarios-job.yml
1818
- eng/testing/performance/*
19-
- eng/testing/ChromeVersions.props
19+
- eng/testing/BrowserVersions.props
2020

2121
variables:
2222
- template: /eng/pipelines/common/variables.yml

eng/pipelines/runtime.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ extends:
824824
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
825825
scenarios:
826826
- normal
827-
- WasmTestOnBrowser
827+
- WasmTestOnChrome
828828

829829
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
830830
parameters:
@@ -833,7 +833,7 @@ extends:
833833
alwaysRun: ${{ variables.isRollingBuild }}
834834
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
835835
scenarios:
836-
- WasmTestOnBrowser
836+
- WasmTestOnChrome
837837

838838
# Library tests with full threading
839839
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
@@ -846,7 +846,7 @@ extends:
846846
alwaysRun: ${{ variables.isRollingBuild }}
847847
shouldRunSmokeOnly: onLibrariesAndIllinkChanges
848848
scenarios:
849-
- WasmTestOnBrowser
849+
- WasmTestOnChrome
850850
#- WasmTestOnNodeJS - this is not supported yet, https://github.com/dotnet/runtime/issues/85592
851851

852852
# EAT Library tests - only run on linux
@@ -935,7 +935,7 @@ extends:
935935
shouldRunSmokeOnly: true
936936
alwaysRun: ${{ variables.isRollingBuild }}
937937
scenarios:
938-
- normal
938+
- WasmTestOnWasmtime
939939

940940
- template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml
941941
parameters:
File renamed without changes.

eng/testing/WasiRunnerAOTTemplate.sh

Lines changed: 0 additions & 90 deletions
This file was deleted.

eng/testing/WasiRunnerTemplate.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,37 @@ echo HARNESS_RUNNER=$HARNESS_RUNNER
4747
echo XHARNESS_COMMAND=$XHARNESS_COMMAND
4848
echo XHARNESS_ARGS=$XHARNESS_ARGS
4949

50+
function _buildAOTFunc()
51+
{
52+
local projectFile=$1
53+
local binLog=$2
54+
shift 2
55+
56+
time dotnet msbuild $projectFile /bl:$binLog $*
57+
local buildExitCode=$?
58+
59+
echo "\n** Performance summary for the build **\n"
60+
dotnet msbuild $binLog -clp:PerformanceSummary -v:q -nologo
61+
if [[ "$(uname -s)" == "Linux" && $buildExitCode -ne 0 ]]; then
62+
echo "\nLast few messages from dmesg:\n"
63+
local lastLines=`dmesg | tail -n 20`
64+
echo $lastLines
65+
66+
if [[ "$lastLines" =~ "oom-kill" ]]; then
67+
return 9200 # OOM
68+
fi
69+
fi
70+
71+
echo
72+
echo
73+
74+
if [[ $buildExitCode -ne 0 ]]; then
75+
return 9100 # aot build failure
76+
fi
77+
78+
return 0
79+
}
80+
5081
pushd $EXECUTION_DIR
5182

5283
# ========================= BEGIN Test Execution =============================

eng/testing/WasmRunnerAOTTemplate.sh

Lines changed: 0 additions & 130 deletions
This file was deleted.

eng/testing/WasmRunnerTemplate.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ 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 (
3333
set XHARNESS_COMMAND=test

0 commit comments

Comments
 (0)