Skip to content

Commit

Permalink
[browser] rename WasmTestOnChrome (dotnet#101140)
Browse files Browse the repository at this point in the history
Co-authored-by: Marek Fišera <mara@neptuo.com>
  • Loading branch information
2 people authored and matouskozak committed Apr 30, 2024
1 parent 32e16b3 commit 9df7336
Show file tree
Hide file tree
Showing 39 changed files with 145 additions and 296 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bump-chrome-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: >-
make -C src/mono/wasm build-tasks &&
PATH=$PWD/.dotnet:$PATH dotnet build eng/testing/bump-chrome-version.proj -p:Configuration=Release &&
git add eng/testing/ChromeVersions.props &&
git add eng/testing/BrowserVersions.props &&
cat eng/testing/bump-chrome-pr.env >> "$GITHUB_ENV"
- name: Check for changes
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/evaluate-default-paths.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ parameters:
_const_paths:
_wasm_specific_only: [
eng/testing/bump-chrome-version.proj
eng/testing/ChromeVersions.props
eng/testing/BrowserVersions.props
eng/testing/WasmRunner*
eng/testing/WasiRunner*
eng/testing/scenarios/BuildWasiAppsJobsList.txt
Expand Down Expand Up @@ -58,7 +58,7 @@ parameters:
]
_wasm_chrome: [
eng/testing/bump-chrome-version.proj
eng/testing/ChromeVersions.props
eng/testing/BrowserVersions.props
]
_perf_pipeline_specific_only: [
eng/pipelines/runtime-wasm-perf.yml
Expand Down
8 changes: 5 additions & 3 deletions eng/pipelines/common/templates/wasm-library-aot-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ jobs:
shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }}
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
scenarios:
- ${{ if eq(platform, 'browser_wasm_win') }}:
- WasmTestOnBrowser
- ${{ if ne(platform, 'browser_wasm_win') }}:
- ${{ if eq(platform, 'browser_wasm') }}:
- normal
- ${{ if eq(platform, 'browser_wasm_win') }}:
- WasmTestOnChrome
- ${{ if or(eq(platform, 'wasi_wasm_win'), eq(platform, 'wasi_wasm')) }}:
- WasmTestOnWasmtime
2 changes: 1 addition & 1 deletion eng/pipelines/common/templates/wasm-library-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- name: _wasmRunSmokeTestsOnlyArg
value: /p:RunSmokeTestsOnly=$(shouldRunSmokeOnlyVar)
- name: chromeInstallArg
${{ if containsValue(parameters.scenarios, 'wasmtestonbrowser') }}:
${{ if containsValue(parameters.scenarios, 'WasmTestOnChrome') }}:
value: /p:InstallChromeForTests=true
${{ else }}:
value: ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
scenarios:
- normal
- WasmTestOnBrowser
- WasmTestOnChrome

# this only runs on the extra pipeline
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
Expand All @@ -114,7 +114,7 @@ jobs:
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
scenarios:
- WasmTestOnBrowser
- WasmTestOnChrome
- WasmTestOnNodeJS

# EAT Library tests - only run on linux
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
alwaysRun: true
scenarios:
- normal
- WasmTestOnBrowser
- WasmTestOnChrome
- WasmTestOnNodeJS

# Hybrid Globalization AOT tests
Expand All @@ -215,7 +215,7 @@ jobs:
alwaysRun: true
scenarios:
- normal
- WasmTestOnBrowser
- WasmTestOnChrome
- WasmTestOnNodeJS

- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/runtime-wasm-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pr:
- eng/pipelines/coreclr/templates/run-perf*
- eng/pipelines/coreclr/templates/run-scenarios-job.yml
- eng/testing/performance/*
- eng/testing/ChromeVersions.props
- eng/testing/BrowserVersions.props

variables:
- template: /eng/pipelines/common/variables.yml
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ extends:
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
scenarios:
- normal
- WasmTestOnBrowser
- WasmTestOnChrome

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

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

# EAT Library tests - only run on linux
Expand Down Expand Up @@ -935,7 +935,7 @@ extends:
shouldRunSmokeOnly: true
alwaysRun: ${{ variables.isRollingBuild }}
scenarios:
- normal
- WasmTestOnWasmtime

- template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml
parameters:
Expand Down
File renamed without changes.
90 changes: 0 additions & 90 deletions eng/testing/WasiRunnerAOTTemplate.sh

This file was deleted.

31 changes: 31 additions & 0 deletions eng/testing/WasiRunnerTemplate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,37 @@ echo HARNESS_RUNNER=$HARNESS_RUNNER
echo XHARNESS_COMMAND=$XHARNESS_COMMAND
echo XHARNESS_ARGS=$XHARNESS_ARGS

function _buildAOTFunc()
{
local projectFile=$1
local binLog=$2
shift 2

time dotnet msbuild $projectFile /bl:$binLog $*
local buildExitCode=$?

echo "\n** Performance summary for the build **\n"
dotnet msbuild $binLog -clp:PerformanceSummary -v:q -nologo
if [[ "$(uname -s)" == "Linux" && $buildExitCode -ne 0 ]]; then
echo "\nLast few messages from dmesg:\n"
local lastLines=`dmesg | tail -n 20`
echo $lastLines

if [[ "$lastLines" =~ "oom-kill" ]]; then
return 9200 # OOM
fi
fi

echo
echo

if [[ $buildExitCode -ne 0 ]]; then
return 9100 # aot build failure
fi

return 0
}

pushd $EXECUTION_DIR

# ========================= BEGIN Test Execution =============================
Expand Down
130 changes: 0 additions & 130 deletions eng/testing/WasmRunnerAOTTemplate.sh

This file was deleted.

2 changes: 1 addition & 1 deletion eng/testing/WasmRunnerTemplate.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if [%XHARNESS_CLI_PATH%] NEQ [] (
)

if [%XHARNESS_COMMAND%] == [] (
if /I [%SCENARIO%]==[WasmTestOnBrowser] (
if /I [%SCENARIO%]==[WasmTestOnChrome] (
set XHARNESS_COMMAND=test-browser
) else (
set XHARNESS_COMMAND=test
Expand Down
Loading

0 comments on commit 9df7336

Please sign in to comment.