From c293b578cfc790ec678740414541eef9b2f0d8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Wed, 26 Jan 2022 13:12:50 +0100 Subject: [PATCH 01/14] Move all SetScriptCommands to a target, so they are placed after scenario in the generated script. Fix passing WasmXHarnessMonoArgs. The original where passed to XHarness, but not to the javascript. --- eng/testing/WasmRunnerTemplate.cmd | 2 +- eng/testing/WasmRunnerTemplate.sh | 2 +- .../System.Net.WebSockets.Client.Tests.csproj | 30 ++++++++++--------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/eng/testing/WasmRunnerTemplate.cmd b/eng/testing/WasmRunnerTemplate.cmd index 2ebcbcf8e93a97..a668ce2c6a464c 100644 --- a/eng/testing/WasmRunnerTemplate.cmd +++ b/eng/testing/WasmRunnerTemplate.cmd @@ -54,7 +54,7 @@ if /I [%XHARNESS_COMMAND%] == [test] ( ) if [%XHARNESS_ARGS%] == [] ( - set "XHARNESS_ARGS=%JS_ENGINE% %JS_ENGINE_ARGS% %BROWSER_PATH% %MAIN_JS% %WASM_XHARNESS_MONO_ARGS%" + set "XHARNESS_ARGS=%JS_ENGINE% %JS_ENGINE_ARGS% %BROWSER_PATH% %MAIN_JS%" ) echo EXECUTION_DIR=%EXECUTION_DIR% diff --git a/eng/testing/WasmRunnerTemplate.sh b/eng/testing/WasmRunnerTemplate.sh index d4e352976e8075..ae78d5304e8aed 100644 --- a/eng/testing/WasmRunnerTemplate.sh +++ b/eng/testing/WasmRunnerTemplate.sh @@ -50,7 +50,7 @@ if [[ "$XHARNESS_COMMAND" == "test" ]]; then fi if [[ -z "$XHARNESS_ARGS" ]]; then - XHARNESS_ARGS="$JS_ENGINE $JS_ENGINE_ARGS $MAIN_JS $WASM_XHARNESS_MONO_ARGS" + XHARNESS_ARGS="$JS_ENGINE $JS_ENGINE_ARGS $MAIN_JS" fi echo EXECUTION_DIR=$EXECUTION_DIR diff --git a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj index 7ceb2cac957647..18c3fb6741a042 100644 --- a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj +++ b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj @@ -20,20 +20,22 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + From 6d36a0de783e5960c02c7d912045254c2be59f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Fri, 28 Jan 2022 14:16:35 +0100 Subject: [PATCH 02/14] Comment about WasmXHarnessArgs and WasmXHarnessMonoArgs - MSBuild property vs env var. --- eng/testing/tests.wasm.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index bed571a3064021..9f5f5fa572c7de 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -53,6 +53,7 @@ <_AppArgs Condition="'$(WasmTestAppArgs)' != ''">$(_AppArgs) $(WasmTestAppArgs) + $HARNESS_RUNNER $(_XHarnessArgs) %24XHARNESS_ARGS %24WasmXHarnessArgs -- $(WasmXHarnessMonoArgs) %24WasmXHarnessMonoArgs $(_AppArgs) %24WasmTestAppArgs %HARNESS_RUNNER% $(_XHarnessArgs) %XHARNESS_ARGS% %WasmXHarnessArgs% -- $(WasmXHarnessMonoArgs) %WasmXHarnessMonoArgs% $(_AppArgs) %WasmTestAppArgs% From 5126624188e123cfd40e5b7389abb5dac6190cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Fri, 28 Jan 2022 14:17:13 +0100 Subject: [PATCH 03/14] Add WasmXHarnessArgsCli MSBuild property that can be used from CLI and doesn't override WasmXHarnessArgs used in csprojs. --- docs/workflow/testing/libraries/testing-wasm.md | 4 ++-- eng/testing/tests.wasm.targets | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/workflow/testing/libraries/testing-wasm.md b/docs/workflow/testing/libraries/testing-wasm.md index da752eb2d5974e..e75c1761d77611 100644 --- a/docs/workflow/testing/libraries/testing-wasm.md +++ b/docs/workflow/testing/libraries/testing-wasm.md @@ -98,9 +98,9 @@ The following shows how to run tests for a specific library ### Passing arguments to xharness -- `$(WasmXHarnessArgs)` - xharness command arguments +- `$(WasmXHarnessArgsCli)` - xharness command arguments - Example: `WasmXHarnessArgs="--set-web-server-http-env=DOTNET_TEST_WEBSOCKETHOST"` -> becomes `dotnet xharness wasm test --set-web-server-http-env=DOTNET_TEST_WEBSOCKETHOST` + Example: `WasmXHarnessArgsCli="--set-web-server-http-env=DOTNET_TEST_WEBSOCKETHOST"` -> becomes `dotnet xharness wasm test --set-web-server-http-env=DOTNET_TEST_WEBSOCKETHOST` - `$(WasmXHarnessMonoArgs)` - arguments and variables for mono diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index 9f5f5fa572c7de..ac7047dd30218e 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -46,6 +46,7 @@ <_XHarnessArgs Condition="'$(IsFunctionalTest)' == 'true'" >$(_XHarnessArgs) --expected-exit-code=$(ExpectedExitCode) <_XHarnessArgs Condition="'$(WasmXHarnessArgs)' != ''" >$(_XHarnessArgs) $(WasmXHarnessArgs) + <_XHarnessArgs Condition="'$(WasmXHarnessArgsCli)' != ''" >$(_XHarnessArgs) $(WasmXHarnessArgsCli) <_AppArgs Condition="'$(IsFunctionalTest)' != 'true' and '$(Scenario)' != 'BuildWasmApps' and '$(WasmMainAssemblyFileName)' == ''">--run WasmTestRunner.dll $(AssemblyName).dll <_AppArgs Condition="'$(IsFunctionalTest)' != 'true' and '$(WasmMainAssemblyFileName)' != ''">--run $(WasmMainAssemblyFileName) From 6308af6cf9113d422692e18c7bc22fc0d87a51d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Fri, 28 Jan 2022 14:17:58 +0100 Subject: [PATCH 04/14] Fix formatting. --- eng/testing/tests.wasm.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index ac7047dd30218e..e9e8d34d696790 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -46,7 +46,7 @@ <_XHarnessArgs Condition="'$(IsFunctionalTest)' == 'true'" >$(_XHarnessArgs) --expected-exit-code=$(ExpectedExitCode) <_XHarnessArgs Condition="'$(WasmXHarnessArgs)' != ''" >$(_XHarnessArgs) $(WasmXHarnessArgs) - <_XHarnessArgs Condition="'$(WasmXHarnessArgsCli)' != ''" >$(_XHarnessArgs) $(WasmXHarnessArgsCli) + <_XHarnessArgs Condition="'$(WasmXHarnessArgsCli)' != ''" >$(_XHarnessArgs) $(WasmXHarnessArgsCli) <_AppArgs Condition="'$(IsFunctionalTest)' != 'true' and '$(Scenario)' != 'BuildWasmApps' and '$(WasmMainAssemblyFileName)' == ''">--run WasmTestRunner.dll $(AssemblyName).dll <_AppArgs Condition="'$(IsFunctionalTest)' != 'true' and '$(WasmMainAssemblyFileName)' != ''">--run $(WasmMainAssemblyFileName) From ae3b9782626c093acd987760c93c01a44491d0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Thu, 3 Feb 2022 17:02:35 +0100 Subject: [PATCH 05/14] Pack nodejs as tar, deliver to helix and untar. --- src/libraries/sendtohelix-wasm.targets | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets index 50f7e8eb849c13..a224d7726e8f66 100644 --- a/src/libraries/sendtohelix-wasm.targets +++ b/src/libraries/sendtohelix-wasm.targets @@ -42,6 +42,9 @@ + + + @@ -133,7 +136,11 @@ - + + + + + From 19b588ac557b2f16b3d86c177abeec8c0a7ecec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Thu, 3 Feb 2022 19:03:52 +0100 Subject: [PATCH 06/14] Fix. --- src/libraries/sendtohelix-wasm.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets index a224d7726e8f66..2ad101782de817 100644 --- a/src/libraries/sendtohelix-wasm.targets +++ b/src/libraries/sendtohelix-wasm.targets @@ -43,8 +43,6 @@ - - @@ -100,6 +98,8 @@ EMSDK- $(Scenario)- + + WasmTestOnBrowser - $(TestArchiveRoot)browseronly/ + $(TestArchiveRoot)browserornodejs/ $(TestArchiveTestsRoot)$(OSPlatformConfig)/ $(DefineConstants);TARGET_BROWSER From 5fe7c0f28fa91268e46c9a2f5491230389ecf8b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Tue, 8 Feb 2022 12:22:19 +0100 Subject: [PATCH 08/14] Delete npm and npx and recreate symbolic links manually. --- src/libraries/sendtohelix-wasm.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets index 2ad101782de817..af1468a30e468a 100644 --- a/src/libraries/sendtohelix-wasm.targets +++ b/src/libraries/sendtohelix-wasm.targets @@ -43,6 +43,7 @@ + From ac6285c822bbddc8b2b8d435cfd8b4453feaf61c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Tue, 8 Feb 2022 14:37:36 +0100 Subject: [PATCH 09/14] Fix and split command. --- src/libraries/sendtohelix-wasm.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets index af1468a30e468a..fad9cd21d01a12 100644 --- a/src/libraries/sendtohelix-wasm.targets +++ b/src/libraries/sendtohelix-wasm.targets @@ -43,7 +43,8 @@ - + + From 5f83a8e59413eb05f22e8bfea9fa28fcb7653eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Tue, 8 Feb 2022 17:20:53 +0100 Subject: [PATCH 10/14] Copy TestEchoMiddleware and RemoteLoopMiddleware even for Scenario=NodeJS. --- src/libraries/sendtohelix-wasm.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets index fad9cd21d01a12..c90a3f96e4d75f 100644 --- a/src/libraries/sendtohelix-wasm.targets +++ b/src/libraries/sendtohelix-wasm.targets @@ -146,7 +146,7 @@ - + From 83660c09365a081c5fc3f30af3626030c8d9347f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Tue, 8 Feb 2022 17:22:07 +0100 Subject: [PATCH 11/14] Split commands per item. --- src/libraries/sendtohelix-wasm.targets | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets index c90a3f96e4d75f..6c18327cabcc6f 100644 --- a/src/libraries/sendtohelix-wasm.targets +++ b/src/libraries/sendtohelix-wasm.targets @@ -44,7 +44,10 @@ - + + + + From 0cf039af0a32f408c7eefbb15750efaf7029d9e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Tue, 8 Feb 2022 17:31:20 +0100 Subject: [PATCH 12/14] Comments. --- src/libraries/sendtohelix-wasm.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets index 6c18327cabcc6f..92f791699c6a77 100644 --- a/src/libraries/sendtohelix-wasm.targets +++ b/src/libraries/sendtohelix-wasm.targets @@ -41,6 +41,7 @@ + @@ -104,6 +105,7 @@ $(Scenario)- + + - @@ -105,9 +104,6 @@ $(Scenario)- - - - - - - + From e7a9d7be0cce13a6fcb9252c9f99088bb2b40597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Tue, 8 Feb 2022 17:39:55 +0100 Subject: [PATCH 14/14] Drop extra spaces. --- src/libraries/sendtohelix-wasm.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets index b871fd8eb56874..269259c5d81e69 100644 --- a/src/libraries/sendtohelix-wasm.targets +++ b/src/libraries/sendtohelix-wasm.targets @@ -103,7 +103,7 @@ EMSDK- $(Scenario)- - +