From 8fae99835d633389477ffd2cdb31a14186b1a433 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Mon, 10 Jun 2024 14:52:54 +0000 Subject: [PATCH 01/10] Use fixed scenarios only when they are not passed. --- eng/pipelines/common/templates/wasm-library-aot-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/pipelines/common/templates/wasm-library-aot-tests.yml b/eng/pipelines/common/templates/wasm-library-aot-tests.yml index 2336f98401515..730e22e496739 100644 --- a/eng/pipelines/common/templates/wasm-library-aot-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-aot-tests.yml @@ -31,6 +31,9 @@ jobs: shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }} shouldContinueOnError: ${{ parameters.shouldContinueOnError }} scenarios: + - ${{ if not(empty(parameters.scenarios)) }}: + - ${{ parameters.scenarios }} + - ${{ if empty(parameters.scenarios) }}: - ${{ if eq(platform, 'browser_wasm') }}: - WasmTestOnV8 - ${{ if eq(platform, 'browser_wasm_win') }}: From 935a441db33bca0a20a8f5a3420096c7be7dacea Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Mon, 10 Jun 2024 15:41:37 +0000 Subject: [PATCH 02/10] Feedback. --- eng/pipelines/common/templates/wasm-library-aot-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/wasm-library-aot-tests.yml b/eng/pipelines/common/templates/wasm-library-aot-tests.yml index 730e22e496739..a456ede8b174f 100644 --- a/eng/pipelines/common/templates/wasm-library-aot-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-aot-tests.yml @@ -10,6 +10,7 @@ parameters: runAOT: false shouldRunSmokeOnly: false shouldContinueOnError: false + scenarios: '' jobs: @@ -33,7 +34,7 @@ jobs: scenarios: - ${{ if not(empty(parameters.scenarios)) }}: - ${{ parameters.scenarios }} - - ${{ if empty(parameters.scenarios) }}: + - ${{ else }}: - ${{ if eq(platform, 'browser_wasm') }}: - WasmTestOnV8 - ${{ if eq(platform, 'browser_wasm_win') }}: From acf237c51fb62530a481dad34882ae3594a4304f Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Tue, 11 Jun 2024 08:20:32 +0000 Subject: [PATCH 03/10] Dummy change to trigger the CI. --- .../src/System/Globalization/TextInfo.WebAssembly.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.WebAssembly.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.WebAssembly.cs index 05e8cc3e1d049..06b66613f038a 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.WebAssembly.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.WebAssembly.cs @@ -10,7 +10,7 @@ public partial class TextInfo { internal unsafe void JsChangeCase(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool toUpper) { - Debug.Assert(!GlobalizationMode.Invariant); + Debug.Assert(!GlobalizationMode.Invariant); // dummy change - to be removed Debug.Assert(!GlobalizationMode.UseNls); Debug.Assert(GlobalizationMode.Hybrid); From 7c3fddd831d45be0c5f38f04ed2bf712c50462b7 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Tue, 11 Jun 2024 08:34:53 +0000 Subject: [PATCH 04/10] Fix: the indentation problem. --- .../templates/wasm-library-aot-tests.yml | 18 +++++++++--------- .../Globalization/TextInfo.WebAssembly.cs | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/pipelines/common/templates/wasm-library-aot-tests.yml b/eng/pipelines/common/templates/wasm-library-aot-tests.yml index a456ede8b174f..bcc3db6d60255 100644 --- a/eng/pipelines/common/templates/wasm-library-aot-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-aot-tests.yml @@ -32,12 +32,12 @@ jobs: shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }} shouldContinueOnError: ${{ parameters.shouldContinueOnError }} scenarios: - - ${{ if not(empty(parameters.scenarios)) }}: - - ${{ parameters.scenarios }} - - ${{ else }}: - - ${{ if eq(platform, 'browser_wasm') }}: - - WasmTestOnV8 - - ${{ if eq(platform, 'browser_wasm_win') }}: - - WasmTestOnChrome - - ${{ if or(eq(platform, 'wasi_wasm_win'), eq(platform, 'wasi_wasm')) }}: - - WasmTestOnWasmtime + - ${{ if not(empty(parameters.scenarios)) }}: + - ${{ parameters.scenarios }} + - ${{ else }}: + - ${{ if eq(platform, 'browser_wasm') }}: + - WasmTestOnV8 + - ${{ if eq(platform, 'browser_wasm_win') }}: + - WasmTestOnChrome + - ${{ if or(eq(platform, 'wasi_wasm_win'), eq(platform, 'wasi_wasm')) }}: + - WasmTestOnWasmtime diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.WebAssembly.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.WebAssembly.cs index 06b66613f038a..05e8cc3e1d049 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.WebAssembly.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.WebAssembly.cs @@ -10,7 +10,7 @@ public partial class TextInfo { internal unsafe void JsChangeCase(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool toUpper) { - Debug.Assert(!GlobalizationMode.Invariant); // dummy change - to be removed + Debug.Assert(!GlobalizationMode.Invariant); Debug.Assert(!GlobalizationMode.UseNls); Debug.Assert(GlobalizationMode.Hybrid); From 44bf7ac8a5aa85e804058b24ac276077a73d9d20 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Tue, 11 Jun 2024 08:38:06 +0000 Subject: [PATCH 05/10] Fix: syntax problem. --- .../common/templates/wasm-library-aot-tests.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/common/templates/wasm-library-aot-tests.yml b/eng/pipelines/common/templates/wasm-library-aot-tests.yml index bcc3db6d60255..27ea2a8c36d28 100644 --- a/eng/pipelines/common/templates/wasm-library-aot-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-aot-tests.yml @@ -32,12 +32,12 @@ jobs: shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }} shouldContinueOnError: ${{ parameters.shouldContinueOnError }} scenarios: - - ${{ if not(empty(parameters.scenarios)) }}: + ${{ if not(empty(parameters.scenarios)) }}: - ${{ parameters.scenarios }} - - ${{ else }}: - - ${{ if eq(platform, 'browser_wasm') }}: + ${{ else }}: + ${{ if eq(platform, 'browser_wasm') }}: - WasmTestOnV8 - - ${{ if eq(platform, 'browser_wasm_win') }}: + ${{ if eq(platform, 'browser_wasm_win') }}: - WasmTestOnChrome - - ${{ if or(eq(platform, 'wasi_wasm_win'), eq(platform, 'wasi_wasm')) }}: + ${{ if or(eq(platform, 'wasi_wasm_win'), eq(platform, 'wasi_wasm')) }}: - WasmTestOnWasmtime From 33d5ec9df104b24177af4cc72c1dc0efdb199bb5 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Tue, 11 Jun 2024 08:40:11 +0000 Subject: [PATCH 06/10] Revert: syntax change did not help. --- .../common/templates/wasm-library-aot-tests.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/common/templates/wasm-library-aot-tests.yml b/eng/pipelines/common/templates/wasm-library-aot-tests.yml index 27ea2a8c36d28..bcc3db6d60255 100644 --- a/eng/pipelines/common/templates/wasm-library-aot-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-aot-tests.yml @@ -32,12 +32,12 @@ jobs: shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }} shouldContinueOnError: ${{ parameters.shouldContinueOnError }} scenarios: - ${{ if not(empty(parameters.scenarios)) }}: + - ${{ if not(empty(parameters.scenarios)) }}: - ${{ parameters.scenarios }} - ${{ else }}: - ${{ if eq(platform, 'browser_wasm') }}: + - ${{ else }}: + - ${{ if eq(platform, 'browser_wasm') }}: - WasmTestOnV8 - ${{ if eq(platform, 'browser_wasm_win') }}: + - ${{ if eq(platform, 'browser_wasm_win') }}: - WasmTestOnChrome - ${{ if or(eq(platform, 'wasi_wasm_win'), eq(platform, 'wasi_wasm')) }}: + - ${{ if or(eq(platform, 'wasi_wasm_win'), eq(platform, 'wasi_wasm')) }}: - WasmTestOnWasmtime From 4dd5d6c3e29be462391f17fc0011236f921cb97e Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Tue, 11 Jun 2024 09:59:50 +0000 Subject: [PATCH 07/10] Fix: remove `empty` keyword --- eng/pipelines/common/templates/wasm-library-aot-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/wasm-library-aot-tests.yml b/eng/pipelines/common/templates/wasm-library-aot-tests.yml index bcc3db6d60255..e82b121344563 100644 --- a/eng/pipelines/common/templates/wasm-library-aot-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-aot-tests.yml @@ -32,7 +32,7 @@ jobs: shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }} shouldContinueOnError: ${{ parameters.shouldContinueOnError }} scenarios: - - ${{ if not(empty(parameters.scenarios)) }}: + - ${{ if (parameters.scenarios != '') }}: - ${{ parameters.scenarios }} - ${{ else }}: - ${{ if eq(platform, 'browser_wasm') }}: From aaf265e7170a0e36c7b1788ae79763e68d7952c8 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:03:00 +0000 Subject: [PATCH 08/10] Fix --- eng/pipelines/common/templates/wasm-library-aot-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/wasm-library-aot-tests.yml b/eng/pipelines/common/templates/wasm-library-aot-tests.yml index e82b121344563..046f2f1a3f886 100644 --- a/eng/pipelines/common/templates/wasm-library-aot-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-aot-tests.yml @@ -32,7 +32,7 @@ jobs: shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }} shouldContinueOnError: ${{ parameters.shouldContinueOnError }} scenarios: - - ${{ if (parameters.scenarios != '') }}: + - ${{ if eq(parameters.scenarios, '') }}: - ${{ parameters.scenarios }} - ${{ else }}: - ${{ if eq(platform, 'browser_wasm') }}: From 7e72824ab2cbbd2c30d87feb56ce674676116ad4 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:17:41 +0000 Subject: [PATCH 09/10] String -> array. --- eng/pipelines/common/templates/wasm-library-aot-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/wasm-library-aot-tests.yml b/eng/pipelines/common/templates/wasm-library-aot-tests.yml index 046f2f1a3f886..2bf45172a9277 100644 --- a/eng/pipelines/common/templates/wasm-library-aot-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-aot-tests.yml @@ -10,7 +10,7 @@ parameters: runAOT: false shouldRunSmokeOnly: false shouldContinueOnError: false - scenarios: '' + scenarios: [] jobs: @@ -32,7 +32,7 @@ jobs: shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }} shouldContinueOnError: ${{ parameters.shouldContinueOnError }} scenarios: - - ${{ if eq(parameters.scenarios, '') }}: + - ${{ if ne(parameters.scenarios[0], '') }}: - ${{ parameters.scenarios }} - ${{ else }}: - ${{ if eq(platform, 'browser_wasm') }}: From 60335b5d844380ada05836c3b413299eda7dee72 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Tue, 11 Jun 2024 12:12:04 +0000 Subject: [PATCH 10/10] Block. --- .../runtime-extra-platforms-wasm.yml | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml index a5c6cb414227d..f5f51cd1fd244 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml @@ -201,21 +201,22 @@ jobs: - WasmTestOnFirefox - WasmTestOnNodeJS - # Hybrid Globalization AOT tests - - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml - parameters: - platforms: - - browser_wasm - - browser_wasm_win - nameSuffix: _HybridGlobalization_AOT - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /p:HybridGlobalization=true - runAOT: true - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - alwaysRun: true - scenarios: - - WasmTestOnChrome - - WasmTestOnNodeJS + # # Hybrid Globalization AOT tests + # # ActiveIssue: https://github.com/dotnet/runtime/issues/51746 + # - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml + # parameters: + # platforms: + # - browser_wasm + # - browser_wasm_win + # nameSuffix: _HybridGlobalization_AOT + # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /p:HybridGlobalization=true + # runAOT: true + # isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} + # isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} + # alwaysRun: true + # scenarios: + # - WasmTestOnChrome + # - WasmTestOnNodeJS - ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}: # Builds only