From 2338edc3f48cae889667f3a48ca6ef332bc4cbd8 Mon Sep 17 00:00:00 2001
From: pavelsavara <pavel.savara@gmail.com>
Date: Wed, 22 Dec 2021 07:46:42 +0100
Subject: [PATCH 1/6] fix make

---
 src/mono/sample/wasm/console-node-cjs/Makefile |  4 ++--
 src/mono/sample/wasm/console-node-es6/Makefile |  4 ++--
 src/mono/sample/wasm/console-v8-cjs/Makefile   | 16 ++++++++++++++++
 src/mono/sample/wasm/console-v8-es6/Makefile   |  4 ++--
 4 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 src/mono/sample/wasm/console-v8-cjs/Makefile

diff --git a/src/mono/sample/wasm/console-node-cjs/Makefile b/src/mono/sample/wasm/console-node-cjs/Makefile
index e1aa7b078338e2..7621d8d3d64c6f 100644
--- a/src/mono/sample/wasm/console-node-cjs/Makefile
+++ b/src/mono/sample/wasm/console-node-cjs/Makefile
@@ -10,7 +10,7 @@ ifneq ($(V),)
 DOTNET_MONO_LOG_LEVEL=--setenv=MONO_LOG_LEVEL=debug
 endif
 
-PROJECT_NAME=Wasm.Console.CJS.Sample.csproj
-CONSOLE_DLL=Wasm.Console.CJS.Sample.dll
+PROJECT_NAME=Wasm.Console.Node.CJS.Sample.csproj
+CONSOLE_DLL=Wasm.Console.Node.CJS.Sample.dll
 
 run: run-console
diff --git a/src/mono/sample/wasm/console-node-es6/Makefile b/src/mono/sample/wasm/console-node-es6/Makefile
index 20c9da20ad0be5..72104120fd4a1a 100644
--- a/src/mono/sample/wasm/console-node-es6/Makefile
+++ b/src/mono/sample/wasm/console-node-es6/Makefile
@@ -10,7 +10,7 @@ ifneq ($(V),)
 DOTNET_MONO_LOG_LEVEL=--setenv=MONO_LOG_LEVEL=debug
 endif
 
-PROJECT_NAME=Wasm.Console.Sample.csproj
-CONSOLE_DLL=Wasm.Console.Sample.dll
+PROJECT_NAME=Wasm.Console.Node.ES6.Sample.csproj
+CONSOLE_DLL=Wasm.Console.Node.ES6.Sample.dll
 
 run: run-console
diff --git a/src/mono/sample/wasm/console-v8-cjs/Makefile b/src/mono/sample/wasm/console-v8-cjs/Makefile
new file mode 100644
index 00000000000000..5f97024ccc5397
--- /dev/null
+++ b/src/mono/sample/wasm/console-v8-cjs/Makefile
@@ -0,0 +1,16 @@
+TOP=../../../../..
+
+include ../wasm.mk
+
+ifneq ($(AOT),)
+override MSBUILD_ARGS+=/p:RunAOTCompilation=true
+endif
+
+ifneq ($(V),)
+DOTNET_MONO_LOG_LEVEL=--setenv=MONO_LOG_LEVEL=debug
+endif
+
+PROJECT_NAME=Wasm.Console.V8.CJS.Sample.csproj
+CONSOLE_DLL=Wasm.Console.V8.CJS.Sample.dll
+
+run: run-console
diff --git a/src/mono/sample/wasm/console-v8-es6/Makefile b/src/mono/sample/wasm/console-v8-es6/Makefile
index 20c9da20ad0be5..84cbbc4772c0e3 100644
--- a/src/mono/sample/wasm/console-v8-es6/Makefile
+++ b/src/mono/sample/wasm/console-v8-es6/Makefile
@@ -10,7 +10,7 @@ ifneq ($(V),)
 DOTNET_MONO_LOG_LEVEL=--setenv=MONO_LOG_LEVEL=debug
 endif
 
-PROJECT_NAME=Wasm.Console.Sample.csproj
-CONSOLE_DLL=Wasm.Console.Sample.dll
+PROJECT_NAME=Wasm.Console.V8.ES6.Sample.csproj
+CONSOLE_DLL=Wasm.Console.V8.ES6.Sample.dll
 
 run: run-console

From c79a056ec9c0166eea095c1a16655c350e7ace53 Mon Sep 17 00:00:00 2001
From: Pavel Savara <pavel.savara@gmail.com>
Date: Wed, 22 Dec 2021 08:02:44 +0100
Subject: [PATCH 2/6] fixes

---
 src/mono/sample/wasm/console-node-cjs/Makefile | 3 ++-
 src/mono/sample/wasm/console-node-es6/Makefile | 3 ++-
 src/mono/sample/wasm/console-v8-cjs/Makefile   | 1 +
 src/mono/sample/wasm/console-v8-es6/Makefile   | 1 +
 src/mono/sample/wasm/wasm.mk                   | 5 ++++-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/mono/sample/wasm/console-node-cjs/Makefile b/src/mono/sample/wasm/console-node-cjs/Makefile
index 7621d8d3d64c6f..5d6de5e730358b 100644
--- a/src/mono/sample/wasm/console-node-cjs/Makefile
+++ b/src/mono/sample/wasm/console-node-cjs/Makefile
@@ -12,5 +12,6 @@ endif
 
 PROJECT_NAME=Wasm.Console.Node.CJS.Sample.csproj
 CONSOLE_DLL=Wasm.Console.Node.CJS.Sample.dll
+MAIN_JS=main.cjs
 
-run: run-console
+run: run-console-node
diff --git a/src/mono/sample/wasm/console-node-es6/Makefile b/src/mono/sample/wasm/console-node-es6/Makefile
index 72104120fd4a1a..a97fd6232158cf 100644
--- a/src/mono/sample/wasm/console-node-es6/Makefile
+++ b/src/mono/sample/wasm/console-node-es6/Makefile
@@ -12,5 +12,6 @@ endif
 
 PROJECT_NAME=Wasm.Console.Node.ES6.Sample.csproj
 CONSOLE_DLL=Wasm.Console.Node.ES6.Sample.dll
+MAIN_JS=main.mjs
 
-run: run-console
+run: run-console-node
diff --git a/src/mono/sample/wasm/console-v8-cjs/Makefile b/src/mono/sample/wasm/console-v8-cjs/Makefile
index 5f97024ccc5397..b2683b63c6847b 100644
--- a/src/mono/sample/wasm/console-v8-cjs/Makefile
+++ b/src/mono/sample/wasm/console-v8-cjs/Makefile
@@ -12,5 +12,6 @@ endif
 
 PROJECT_NAME=Wasm.Console.V8.CJS.Sample.csproj
 CONSOLE_DLL=Wasm.Console.V8.CJS.Sample.dll
+MAIN_JS=main.cjs
 
 run: run-console
diff --git a/src/mono/sample/wasm/console-v8-es6/Makefile b/src/mono/sample/wasm/console-v8-es6/Makefile
index 84cbbc4772c0e3..7ceb7d3a72d0a4 100644
--- a/src/mono/sample/wasm/console-v8-es6/Makefile
+++ b/src/mono/sample/wasm/console-v8-es6/Makefile
@@ -12,5 +12,6 @@ endif
 
 PROJECT_NAME=Wasm.Console.V8.ES6.Sample.csproj
 CONSOLE_DLL=Wasm.Console.V8.ES6.Sample.dll
+MAIN_JS=v8shim.cjs
 
 run: run-console
diff --git a/src/mono/sample/wasm/wasm.mk b/src/mono/sample/wasm/wasm.mk
index 624722c2169454..89759c3c7745ca 100644
--- a/src/mono/sample/wasm/wasm.mk
+++ b/src/mono/sample/wasm/wasm.mk
@@ -30,4 +30,7 @@ run-browser:
 	fi
 
 run-console:
-	cd bin/$(CONFIG)/AppBundle && ~/.jsvu/v8 --stack-trace-limit=1000 --single-threaded --expose_wasm test-main.js -- $(DOTNET_MONO_LOG_LEVEL) --run $(CONSOLE_DLL) $(ARGS)
+	cd bin/$(CONFIG)/AppBundle && ~/.jsvu/v8 --stack-trace-limit=1000 --single-threaded --expose_wasm $(MAIN_JS) -- $(DOTNET_MONO_LOG_LEVEL) --run $(CONSOLE_DLL) $(ARGS)
+
+run-console-node:
+	cd bin/$(CONFIG)/AppBundle && node --stack-trace-limit=1000 --single-threaded --expose_wasm $(MAIN_JS) -- $(DOTNET_MONO_LOG_LEVEL) --run $(CONSOLE_DLL) $(ARGS)

From 2031bcc5e42a7743fa88831e3d44fc0de47c682b Mon Sep 17 00:00:00 2001
From: pavelsavara <pavel.savara@gmail.com>
Date: Wed, 22 Dec 2021 08:33:29 +0100
Subject: [PATCH 3/6] fix lower case scenarios

---
 eng/pipelines/libraries/outerloop-mono.yml                  | 2 +-
 eng/pipelines/runtime-manual.yml                            | 6 +++---
 eng/pipelines/runtime-staging.yml                           | 2 +-
 eng/pipelines/runtime.yml                                   | 2 +-
 eng/testing/WasmRunnerAOTTemplate.sh                        | 6 +++---
 eng/testing/WasmRunnerTemplate.cmd                          | 4 ++--
 eng/testing/WasmRunnerTemplate.sh                           | 6 +++---
 src/libraries/sendtohelixhelp.proj                          | 2 +-
 .../Wasm.Build.Tests/data/RunScriptTemplate.cmd             | 4 ++--
 .../Wasm.Build.Tests/data/RunScriptTemplate.sh              | 6 +++---
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/eng/pipelines/libraries/outerloop-mono.yml b/eng/pipelines/libraries/outerloop-mono.yml
index f73f0c1e03c323..1267cf72a62dea 100644
--- a/eng/pipelines/libraries/outerloop-mono.yml
+++ b/eng/pipelines/libraries/outerloop-mono.yml
@@ -39,7 +39,7 @@ jobs:
         extraStepsTemplate: /eng/pipelines/libraries/helix.yml
         extraStepsParameters:
           scenarios:
-          - wasmtestonbrowser
+          - WasmTestOnBrowser
           testScope: outerloop
           creator: dotnet-bot
           testRunNamePrefixSuffix: Mono_$(_BuildConfig)
diff --git a/eng/pipelines/runtime-manual.yml b/eng/pipelines/runtime-manual.yml
index fccddad5db0098..a4391cff70da59 100644
--- a/eng/pipelines/runtime-manual.yml
+++ b/eng/pipelines/runtime-manual.yml
@@ -316,8 +316,8 @@ jobs:
         extraHelixArguments: /p:BrowserHost=windows
         scenarios:
         - normal
-        - wasmtestonbrowser
-        - wasmtestonnodejs
+        - WasmTestOnBrowser
+        - WasmTestOnNodeJs
         condition: >-
           or(
           eq(variables['librariesContainsChange'], true),
@@ -498,7 +498,7 @@ jobs:
         creator: dotnet-bot
         testRunNamePrefixSuffix: Mono_$(_BuildConfig)
         scenarios:
-        - wasmtestonnodejs
+        - WasmTestOnNodeJs
         condition: >-
           or(
           eq(variables['librariesContainsChange'], true),
diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml
index 79ed215e3a6393..4288d372433df7 100644
--- a/eng/pipelines/runtime-staging.yml
+++ b/eng/pipelines/runtime-staging.yml
@@ -526,7 +526,7 @@ jobs:
         extraHelixArguments: /p:BrowserHost=windows $(_runSmokeTestsOnlyArg)
         scenarios:
         - normal
-        - wasmtestonbrowser
+        - WasmTestOnBrowser
         condition: >-
           or(
           eq(variables['librariesContainsChange'], true),
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index d49bf441a853b9..5d7f3ffde2f81b 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -380,7 +380,7 @@ jobs:
         testRunNamePrefixSuffix: Mono_$(_BuildConfig)
         scenarios:
         - normal
-        - wasmtestonbrowser
+        - WasmTestOnBrowser
         condition: >-
           or(
           eq(variables['librariesContainsChange'], true),
diff --git a/eng/testing/WasmRunnerAOTTemplate.sh b/eng/testing/WasmRunnerAOTTemplate.sh
index 160f103656664e..71aa3943c31aa4 100644
--- a/eng/testing/WasmRunnerAOTTemplate.sh
+++ b/eng/testing/WasmRunnerAOTTemplate.sh
@@ -24,16 +24,16 @@ else
 fi
 
 if [[ -z "$XHARNESS_COMMAND" ]]; then
-	if [[ "${SCENARIO,,}" == "wasmtestonbrowser" ]]; then
+	if [[ "$SCENARIO" == "WasmTestOnBrowser" || "$SCENARIO" == "wasmtestonbrowser"]]; then
 		XHARNESS_COMMAND="test-browser"
 	else
 		XHARNESS_COMMAND="test"
 	fi
 fi
 
-if [[ "${XHARNESS_COMMAND,,}" == "test" ]]; then
+if [[ "$XHARNESS_COMMAND" == "test" ]]; then
 	if [[ -z "$JS_ENGINE" ]]; then
-		if [[ "${SCENARIO,,}" == "wasmtestonnodejs" ]]; then
+		if [[ "$SCENARIO" == "WasmTestOnNodeJs" || "$SCENARIO" == "wasmtestonnodejs"]]; then
 			JS_ENGINE="--engine=NodeJS"
 		else
 			JS_ENGINE="--engine=V8"
diff --git a/eng/testing/WasmRunnerTemplate.cmd b/eng/testing/WasmRunnerTemplate.cmd
index 2ba3baa0948e03..9382fa8368fc53 100644
--- a/eng/testing/WasmRunnerTemplate.cmd
+++ b/eng/testing/WasmRunnerTemplate.cmd
@@ -25,7 +25,7 @@ if [%XHARNESS_CLI_PATH%] NEQ [] (
 )
 
 if [%XHARNESS_COMMAND%] == [] (
-    if /I [%SCENARIO%]==[wasmtestonbrowser] (
+    if /I [%SCENARIO%]==[WasmTestOnBrowser] (
         set XHARNESS_COMMAND=test-browser
     ) else (
         set XHARNESS_COMMAND=test
@@ -34,7 +34,7 @@ if [%XHARNESS_COMMAND%] == [] (
 
 if /I [%XHARNESS_COMMAND%] == [test] (
     if [%JS_ENGINE%] == [] (
-        if /I [%SCENARIO%] == [wasmtestonnodejs] (
+        if /I [%SCENARIO%] == [WasmTestOnNodeJs] (
             set "JS_ENGINE=--engine^=NodeJS"
         ) else (
             set "JS_ENGINE=--engine^=V8"
diff --git a/eng/testing/WasmRunnerTemplate.sh b/eng/testing/WasmRunnerTemplate.sh
index edd491603c27db..f2f36948f5f026 100644
--- a/eng/testing/WasmRunnerTemplate.sh
+++ b/eng/testing/WasmRunnerTemplate.sh
@@ -24,16 +24,16 @@ else
 fi
 
 if [[ -z "$XHARNESS_COMMAND" ]]; then
-	if [[ "${SCENARIO,,}" == "wasmtestonbrowser" ]]; then
+	if [[ "$SCENARIO" == "WasmTestOnBrowser" || "$SCENARIO" == "wasmtestonbrowser"]]; then
 		XHARNESS_COMMAND="test-browser"
 	else
 		XHARNESS_COMMAND="test"
 	fi
 fi
 
-if [[ "${XHARNESS_COMMAND,,}" == "test" ]]; then
+if [[ "$XHARNESS_COMMAND" == "test" ]]; then
 	if [[ -z "$JS_ENGINE" ]]; then
-		if [[ "${SCENARIO,,}" == "wasmtestonnodejs" ]]; then
+		if [[ "$SCENARIO" == "WasmTestOnNodeJs" || "$SCENARIO" == "wasmtestonnodejs"]]; then
 			JS_ENGINE="--engine=NodeJS"
 		else
 			JS_ENGINE="--engine=V8"
diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index f1c68f3afdb0c3..c073cf777c3569 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -36,7 +36,7 @@
     <_workItemTimeout Condition="'$(Scenario)' == '' and '$(_workItemTimeout)' == '' and '$(Outerloop)' == 'true'">00:20:00</_workItemTimeout>
     <_workItemTimeout Condition="'$(Scenario)' == '' and '$(_workItemTimeout)' == ''">00:15:00</_workItemTimeout>
     <_workItemTimeout Condition="'$(Scenario)' != '' and '$(_workItemTimeout)' == ''">00:30:00</_workItemTimeout>
-    <_workItemTimeout Condition="'$(Scenario)' == 'wasmtestonbrowser' and '$(BrowserHost)' == 'windows'">00:45:00</_workItemTimeout>
+    <_workItemTimeout Condition="'$(Scenario)' == 'WasmTestOnBrowser' and '$(BrowserHost)' == 'windows'">00:45:00</_workItemTimeout>
 
     <!-- The Helix runtime payload and the tests to run -->
     <!-- TestArchiveRuntimeFile will be passed as a property by the calling project -->
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.cmd b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.cmd
index 5e70805c803e9b..b29ec0164d085b 100644
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.cmd
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.cmd
@@ -25,7 +25,7 @@ if [%XHARNESS_CLI_PATH%] NEQ [] (
 )
 
 if [%XHARNESS_COMMAND%] == [] (
-    if /I [%SCENARIO%]==[wasmtestonbrowser] (
+    if /I [%SCENARIO%]==[WasmTestOnBrowser] (
         set XHARNESS_COMMAND=test-browser
     ) else (
         set XHARNESS_COMMAND=test
@@ -34,7 +34,7 @@ if [%XHARNESS_COMMAND%] == [] (
 
 if /I [%XHARNESS_COMMAND%] == [test] (
     if [%JS_ENGINE%] == [] (
-        if /I [%SCENARIO%] == [wasmtestonnodejs] (
+        if /I [%SCENARIO%] == [WasmTestOnNodeJs] (
             set "JS_ENGINE=--engine^=NodeJS"
         ) else (
             set "JS_ENGINE=--engine^=V8"
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh
index 8a099b9c601363..e4df1cd72fd62b 100644
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh
@@ -24,16 +24,16 @@ else
 fi
 
 if [[ -z "$XHARNESS_COMMAND" ]]; then
-	if [[ "${SCENARIO,,}" == "wasmtestonbrowser" ]]; then
+	if [[ "$SCENARIO" == "WasmTestOnBrowser" || "$SCENARIO" == "wasmtestonbrowser"]]; then
 		XHARNESS_COMMAND="test-browser"
 	else
 		XHARNESS_COMMAND="test"
 	fi
 fi
 
-if [[ "${XHARNESS_COMMAND,,}" == "test" ]]; then
+if [[ "$XHARNESS_COMMAND" == "test" ]]; then
 	if [[ -z "$JS_ENGINE" ]]; then
-		if [[ "${SCENARIO,,}" == "wasmtestonnodejs" ]]; then
+		if [[ "$SCENARIO" == "WasmTestOnNodeJs" || "$SCENARIO" == "wasmtestonnodejs"]]; then
 			JS_ENGINE="--engine=NodeJS"
 		else
 			JS_ENGINE="--engine=V8"

From 64be6caf588d2cc0ebb1b76521bbf43d4bbdf225 Mon Sep 17 00:00:00 2001
From: pavelsavara <pavel.savara@gmail.com>
Date: Wed, 22 Dec 2021 08:38:59 +0100
Subject: [PATCH 4/6] fix

---
 eng/testing/WasmRunnerAOTTemplate.sh                          | 4 ++--
 eng/testing/WasmRunnerTemplate.sh                             | 4 ++--
 .../BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/testing/WasmRunnerAOTTemplate.sh b/eng/testing/WasmRunnerAOTTemplate.sh
index 71aa3943c31aa4..222ff2eba41b66 100644
--- a/eng/testing/WasmRunnerAOTTemplate.sh
+++ b/eng/testing/WasmRunnerAOTTemplate.sh
@@ -24,7 +24,7 @@ else
 fi
 
 if [[ -z "$XHARNESS_COMMAND" ]]; then
-	if [[ "$SCENARIO" == "WasmTestOnBrowser" || "$SCENARIO" == "wasmtestonbrowser"]]; then
+	if [[ "$SCENARIO" == "WasmTestOnBrowser" ]] || [[ "$SCENARIO" == "wasmtestonbrowser"]]; then
 		XHARNESS_COMMAND="test-browser"
 	else
 		XHARNESS_COMMAND="test"
@@ -33,7 +33,7 @@ fi
 
 if [[ "$XHARNESS_COMMAND" == "test" ]]; then
 	if [[ -z "$JS_ENGINE" ]]; then
-		if [[ "$SCENARIO" == "WasmTestOnNodeJs" || "$SCENARIO" == "wasmtestonnodejs"]]; then
+		if [[ "$SCENARIO" == "WasmTestOnNodeJs" ]] || [[ "$SCENARIO" == "wasmtestonnodejs"]]; then
 			JS_ENGINE="--engine=NodeJS"
 		else
 			JS_ENGINE="--engine=V8"
diff --git a/eng/testing/WasmRunnerTemplate.sh b/eng/testing/WasmRunnerTemplate.sh
index f2f36948f5f026..b0a244e37637c0 100644
--- a/eng/testing/WasmRunnerTemplate.sh
+++ b/eng/testing/WasmRunnerTemplate.sh
@@ -24,7 +24,7 @@ else
 fi
 
 if [[ -z "$XHARNESS_COMMAND" ]]; then
-	if [[ "$SCENARIO" == "WasmTestOnBrowser" || "$SCENARIO" == "wasmtestonbrowser"]]; then
+	if [[ "$SCENARIO" == "WasmTestOnBrowser" ]] || [[ "$SCENARIO" == "wasmtestonbrowser"]]; then
 		XHARNESS_COMMAND="test-browser"
 	else
 		XHARNESS_COMMAND="test"
@@ -33,7 +33,7 @@ fi
 
 if [[ "$XHARNESS_COMMAND" == "test" ]]; then
 	if [[ -z "$JS_ENGINE" ]]; then
-		if [[ "$SCENARIO" == "WasmTestOnNodeJs" || "$SCENARIO" == "wasmtestonnodejs"]]; then
+		if [[ "$SCENARIO" == "WasmTestOnNodeJs" ]] || [[ "$SCENARIO" == "wasmtestonnodejs"]]; then
 			JS_ENGINE="--engine=NodeJS"
 		else
 			JS_ENGINE="--engine=V8"
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh
index e4df1cd72fd62b..3c000658f73b5a 100644
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh
@@ -24,7 +24,7 @@ else
 fi
 
 if [[ -z "$XHARNESS_COMMAND" ]]; then
-	if [[ "$SCENARIO" == "WasmTestOnBrowser" || "$SCENARIO" == "wasmtestonbrowser"]]; then
+	if [[ "$SCENARIO" == "WasmTestOnBrowser" ]] || [[ "$SCENARIO" == "wasmtestonbrowser"]]; then
 		XHARNESS_COMMAND="test-browser"
 	else
 		XHARNESS_COMMAND="test"
@@ -33,7 +33,7 @@ fi
 
 if [[ "$XHARNESS_COMMAND" == "test" ]]; then
 	if [[ -z "$JS_ENGINE" ]]; then
-		if [[ "$SCENARIO" == "WasmTestOnNodeJs" || "$SCENARIO" == "wasmtestonnodejs"]]; then
+		if [[ "$SCENARIO" == "WasmTestOnNodeJs" ]] || [[ "$SCENARIO" == "wasmtestonnodejs"]]; then
 			JS_ENGINE="--engine=NodeJS"
 		else
 			JS_ENGINE="--engine=V8"

From 9c41121bd4846f198cff027990a2454b9f470752 Mon Sep 17 00:00:00 2001
From: pavelsavara <pavel.savara@gmail.com>
Date: Wed, 22 Dec 2021 08:43:06 +0100
Subject: [PATCH 5/6] fix or

---
 eng/testing/WasmRunnerAOTTemplate.sh                          | 4 ++--
 eng/testing/WasmRunnerTemplate.sh                             | 4 ++--
 .../BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/testing/WasmRunnerAOTTemplate.sh b/eng/testing/WasmRunnerAOTTemplate.sh
index 222ff2eba41b66..5ec2efa06e0f02 100644
--- a/eng/testing/WasmRunnerAOTTemplate.sh
+++ b/eng/testing/WasmRunnerAOTTemplate.sh
@@ -24,7 +24,7 @@ else
 fi
 
 if [[ -z "$XHARNESS_COMMAND" ]]; then
-	if [[ "$SCENARIO" == "WasmTestOnBrowser" ]] || [[ "$SCENARIO" == "wasmtestonbrowser"]]; then
+	if [[ "$SCENARIO" == "WasmTestOnBrowser" -o "$SCENARIO" == "wasmtestonbrowser"]]; then
 		XHARNESS_COMMAND="test-browser"
 	else
 		XHARNESS_COMMAND="test"
@@ -33,7 +33,7 @@ fi
 
 if [[ "$XHARNESS_COMMAND" == "test" ]]; then
 	if [[ -z "$JS_ENGINE" ]]; then
-		if [[ "$SCENARIO" == "WasmTestOnNodeJs" ]] || [[ "$SCENARIO" == "wasmtestonnodejs"]]; then
+		if [[ "$SCENARIO" == "WasmTestOnNodeJs" -o "$SCENARIO" == "wasmtestonnodejs"]]; then
 			JS_ENGINE="--engine=NodeJS"
 		else
 			JS_ENGINE="--engine=V8"
diff --git a/eng/testing/WasmRunnerTemplate.sh b/eng/testing/WasmRunnerTemplate.sh
index b0a244e37637c0..8135c2727a643b 100644
--- a/eng/testing/WasmRunnerTemplate.sh
+++ b/eng/testing/WasmRunnerTemplate.sh
@@ -24,7 +24,7 @@ else
 fi
 
 if [[ -z "$XHARNESS_COMMAND" ]]; then
-	if [[ "$SCENARIO" == "WasmTestOnBrowser" ]] || [[ "$SCENARIO" == "wasmtestonbrowser"]]; then
+	if [[ "$SCENARIO" == "WasmTestOnBrowser" -o "$SCENARIO" == "wasmtestonbrowser"]]; then
 		XHARNESS_COMMAND="test-browser"
 	else
 		XHARNESS_COMMAND="test"
@@ -33,7 +33,7 @@ fi
 
 if [[ "$XHARNESS_COMMAND" == "test" ]]; then
 	if [[ -z "$JS_ENGINE" ]]; then
-		if [[ "$SCENARIO" == "WasmTestOnNodeJs" ]] || [[ "$SCENARIO" == "wasmtestonnodejs"]]; then
+		if [[ "$SCENARIO" == "WasmTestOnNodeJs" -o "$SCENARIO" == "wasmtestonnodejs"]]; then
 			JS_ENGINE="--engine=NodeJS"
 		else
 			JS_ENGINE="--engine=V8"
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh
index 3c000658f73b5a..4cf167ffe0400c 100644
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh
@@ -24,7 +24,7 @@ else
 fi
 
 if [[ -z "$XHARNESS_COMMAND" ]]; then
-	if [[ "$SCENARIO" == "WasmTestOnBrowser" ]] || [[ "$SCENARIO" == "wasmtestonbrowser"]]; then
+	if [[ "$SCENARIO" == "WasmTestOnBrowser" -o "$SCENARIO" == "wasmtestonbrowser"]]; then
 		XHARNESS_COMMAND="test-browser"
 	else
 		XHARNESS_COMMAND="test"
@@ -33,7 +33,7 @@ fi
 
 if [[ "$XHARNESS_COMMAND" == "test" ]]; then
 	if [[ -z "$JS_ENGINE" ]]; then
-		if [[ "$SCENARIO" == "WasmTestOnNodeJs" ]] || [[ "$SCENARIO" == "wasmtestonnodejs"]]; then
+		if [[ "$SCENARIO" == "WasmTestOnNodeJs" -o "$SCENARIO" == "wasmtestonnodejs"]]; then
 			JS_ENGINE="--engine=NodeJS"
 		else
 			JS_ENGINE="--engine=V8"

From e8f5f54c41aea774d0ba1f960b2b4cc56205c54e Mon Sep 17 00:00:00 2001
From: pavelsavara <pavel.savara@gmail.com>
Date: Wed, 22 Dec 2021 08:44:59 +0100
Subject: [PATCH 6/6] fix

---
 eng/testing/WasmRunnerAOTTemplate.sh                          | 4 ++--
 eng/testing/WasmRunnerTemplate.sh                             | 4 ++--
 .../BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/testing/WasmRunnerAOTTemplate.sh b/eng/testing/WasmRunnerAOTTemplate.sh
index 5ec2efa06e0f02..7348a25674c008 100644
--- a/eng/testing/WasmRunnerAOTTemplate.sh
+++ b/eng/testing/WasmRunnerAOTTemplate.sh
@@ -24,7 +24,7 @@ else
 fi
 
 if [[ -z "$XHARNESS_COMMAND" ]]; then
-	if [[ "$SCENARIO" == "WasmTestOnBrowser" -o "$SCENARIO" == "wasmtestonbrowser"]]; then
+	if [[ "$SCENARIO" == "WasmTestOnBrowser" || "$SCENARIO" == "wasmtestonbrowser" ]]; then
 		XHARNESS_COMMAND="test-browser"
 	else
 		XHARNESS_COMMAND="test"
@@ -33,7 +33,7 @@ fi
 
 if [[ "$XHARNESS_COMMAND" == "test" ]]; then
 	if [[ -z "$JS_ENGINE" ]]; then
-		if [[ "$SCENARIO" == "WasmTestOnNodeJs" -o "$SCENARIO" == "wasmtestonnodejs"]]; then
+		if [[ "$SCENARIO" == "WasmTestOnNodeJs" || "$SCENARIO" == "wasmtestonnodejs" ]]; then
 			JS_ENGINE="--engine=NodeJS"
 		else
 			JS_ENGINE="--engine=V8"
diff --git a/eng/testing/WasmRunnerTemplate.sh b/eng/testing/WasmRunnerTemplate.sh
index 8135c2727a643b..ae78d5304e8aed 100644
--- a/eng/testing/WasmRunnerTemplate.sh
+++ b/eng/testing/WasmRunnerTemplate.sh
@@ -24,7 +24,7 @@ else
 fi
 
 if [[ -z "$XHARNESS_COMMAND" ]]; then
-	if [[ "$SCENARIO" == "WasmTestOnBrowser" -o "$SCENARIO" == "wasmtestonbrowser"]]; then
+	if [[ "$SCENARIO" == "WasmTestOnBrowser" || "$SCENARIO" == "wasmtestonbrowser" ]]; then
 		XHARNESS_COMMAND="test-browser"
 	else
 		XHARNESS_COMMAND="test"
@@ -33,7 +33,7 @@ fi
 
 if [[ "$XHARNESS_COMMAND" == "test" ]]; then
 	if [[ -z "$JS_ENGINE" ]]; then
-		if [[ "$SCENARIO" == "WasmTestOnNodeJs" -o "$SCENARIO" == "wasmtestonnodejs"]]; then
+		if [[ "$SCENARIO" == "WasmTestOnNodeJs" || "$SCENARIO" == "wasmtestonnodejs" ]]; then
 			JS_ENGINE="--engine=NodeJS"
 		else
 			JS_ENGINE="--engine=V8"
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh
index 4cf167ffe0400c..95a4b8200930c6 100644
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh
@@ -24,7 +24,7 @@ else
 fi
 
 if [[ -z "$XHARNESS_COMMAND" ]]; then
-	if [[ "$SCENARIO" == "WasmTestOnBrowser" -o "$SCENARIO" == "wasmtestonbrowser"]]; then
+	if [[ "$SCENARIO" == "WasmTestOnBrowser" || "$SCENARIO" == "wasmtestonbrowser" ]]; then
 		XHARNESS_COMMAND="test-browser"
 	else
 		XHARNESS_COMMAND="test"
@@ -33,7 +33,7 @@ fi
 
 if [[ "$XHARNESS_COMMAND" == "test" ]]; then
 	if [[ -z "$JS_ENGINE" ]]; then
-		if [[ "$SCENARIO" == "WasmTestOnNodeJs" -o "$SCENARIO" == "wasmtestonnodejs"]]; then
+		if [[ "$SCENARIO" == "WasmTestOnNodeJs" || "$SCENARIO" == "wasmtestonnodejs" ]]; then
 			JS_ENGINE="--engine=NodeJS"
 		else
 			JS_ENGINE="--engine=V8"