From 9580e3b5c6d681f6ab243048eb62fe0b45219c68 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 5 Jan 2023 17:11:57 -0500 Subject: [PATCH 1/3] [wasm] Run library tests with v8 --experimental-wasm-eh --- eng/testing/WasmRunnerAOTTemplate.sh | 9 +++++---- eng/testing/WasmRunnerTemplate.cmd | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/eng/testing/WasmRunnerAOTTemplate.sh b/eng/testing/WasmRunnerAOTTemplate.sh index e44faf7f8c0aa1..637e96e574d9d2 100644 --- a/eng/testing/WasmRunnerAOTTemplate.sh +++ b/eng/testing/WasmRunnerAOTTemplate.sh @@ -32,21 +32,22 @@ if [[ -z "$XHARNESS_COMMAND" ]]; then fi if [[ "$XHARNESS_COMMAND" == "test" ]]; then + if [[ -z "$JS_ENGINE_ARGS" ]]; then + JS_ENGINE_ARGS="--engine-arg=--stack-trace-limit=1000" + fi + if [[ -z "$JS_ENGINE" ]]; then if [[ "$SCENARIO" == "WasmTestOnNodeJS" || "$SCENARIO" == "wasmtestonnodejs" ]]; then JS_ENGINE="--engine=NodeJS" else JS_ENGINE="--engine=V8" + JS_ENGINE_ARGS="$JS_ENGINE_ARGS --experimental-wasm-eh" fi fi if [[ -z "$MAIN_JS" ]]; then MAIN_JS="--js-file=test-main.js" fi - - if [[ -z "$JS_ENGINE_ARGS" ]]; then - JS_ENGINE_ARGS="--engine-arg=--stack-trace-limit=1000" - fi fi if [[ -z "$XHARNESS_ARGS" ]]; then diff --git a/eng/testing/WasmRunnerTemplate.cmd b/eng/testing/WasmRunnerTemplate.cmd index 1fc0e6ef4f7697..ca5d00bb3c23f3 100644 --- a/eng/testing/WasmRunnerTemplate.cmd +++ b/eng/testing/WasmRunnerTemplate.cmd @@ -33,20 +33,21 @@ if [%XHARNESS_COMMAND%] == [] ( ) if /I [%XHARNESS_COMMAND%] == [test] ( + if [%JS_ENGINE_ARGS%] == [] ( + set "JS_ENGINE_ARGS=--engine-arg^=--stack-trace-limit^=1000" + ) + if [%JS_ENGINE%] == [] ( if /I [%SCENARIO%] == [WasmTestOnNodeJS] ( set "JS_ENGINE=--engine^=NodeJS" ) else ( set "JS_ENGINE=--engine^=V8" + set "JS_ENGINE_ARGS=%JS_ENGINE_ARGS% --engine-arg^=--experimental-wasm-eh" ) ) if [%MAIN_JS%] == [] ( set "MAIN_JS=--js-file^=test-main.js" ) - - if [%JS_ENGINE_ARGS%] == [] ( - set "JS_ENGINE_ARGS=--engine-arg^=--stack-trace-limit^=1000" - ) ) else ( if [%BROWSER_PATH%] == [] if not [%HELIX_CORRELATION_PAYLOAD%] == [] ( set "BROWSER_PATH=--browser-path^=%HELIX_CORRELATION_PAYLOAD%\chrome-win\chrome.exe" From 97e8ad88c5ba7c4a11c5c144b61b15a5bda444e5 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 5 Jan 2023 23:02:37 +0000 Subject: [PATCH 2/3] [wasm] Fix v8 arg --- eng/testing/WasmRunnerAOTTemplate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/testing/WasmRunnerAOTTemplate.sh b/eng/testing/WasmRunnerAOTTemplate.sh index 637e96e574d9d2..558823546f2bf0 100644 --- a/eng/testing/WasmRunnerAOTTemplate.sh +++ b/eng/testing/WasmRunnerAOTTemplate.sh @@ -41,7 +41,7 @@ if [[ "$XHARNESS_COMMAND" == "test" ]]; then JS_ENGINE="--engine=NodeJS" else JS_ENGINE="--engine=V8" - JS_ENGINE_ARGS="$JS_ENGINE_ARGS --experimental-wasm-eh" + JS_ENGINE_ARGS="$JS_ENGINE_ARGS --engine-arg=--experimental-wasm-eh" fi fi From b3521a174ed831a13df57b5eefc0286ca0f40f88 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 5 Jan 2023 17:57:05 -0500 Subject: [PATCH 3/3] [wasm] Update path triggers to account for eng/testing/Wasm* --- eng/pipelines/common/evaluate-default-paths.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 84af019a0b17f2..235d67af1b90de 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -8,6 +8,7 @@ parameters: _wasm_specific_only: [ eng/testing/ProvisioningVersions.props eng/testing/scenarios/BuildWasmAppsJobsList.txt + eng/testing/Wasm* eng/testing/tests.wasm.targets src/libraries/sendtohelix-wasm.targets src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/* @@ -56,6 +57,7 @@ jobs: - eng/pipelines/installer/* - eng/pipelines/mono/* - eng/pipelines/libraries/* + - ${{ parameters._const_paths._wasm_specific_only }} - ${{ parameters._const_paths._wasm_pipelines }} - ${{ parameters._const_paths._always_exclude }} @@ -140,6 +142,7 @@ jobs: - eng/pipelines/mono/* - eng/pipelines/libraries/* - ${{ parameters._const_paths._wasm_pipelines }} + - ${{ parameters._const_paths._wasm_specific_only }} - ${{ parameters._const_paths._always_exclude }} # We have limited Apple Silicon testing capacity