rebase

dotnet · Apr 17, 2024 · 1f11fed · 1f11fed
1 parent 44e29c2
commit 1f11fed
Show file tree

Hide file tree

Showing 31 changed files with 136 additions and 284 deletions.
diff --git a/eng/pipelines/common/templates/wasm-library-aot-tests.yml b/eng/pipelines/common/templates/wasm-library-aot-tests.yml
@@ -31,7 +31,11 @@ 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 eq(platform, 'wasi_wasm_win') }}:
+          - WasmTestOnWasmtime
+        - ${{ if eq(platform, 'wasi_wasm') }}:
+          - WasmTestOnWasmtime
diff --git a/eng/pipelines/common/templates/wasm-library-tests.yml b/eng/pipelines/common/templates/wasm-library-tests.yml
@@ -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: ''

diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
@@ -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
@@ -114,7 +114,7 @@ jobs:
       isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
       isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
       scenarios:
-        - WasmTestOnBrowser
+        - WasmTestOnChrome
         - WasmTestOnNodeJS
 
   # EAT Library tests - only run on linux
@@ -198,7 +198,7 @@ jobs:
       alwaysRun: true
       scenarios:
         - normal
-        - WasmTestOnBrowser
+        - WasmTestOnChrome
         - WasmTestOnNodeJS
 
   # Hybrid Globalization AOT tests
@@ -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)) }}:

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
@@ -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:
@@ -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
@@ -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
@@ -935,7 +935,7 @@ extends:
           shouldRunSmokeOnly: true
           alwaysRun: ${{ variables.isRollingBuild }}
           scenarios:
-            - normal
+            - WasmTestOnWasmtime
 
       - template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml
         parameters:

diff --git a/eng/testing/WasiRunnerAOTTemplate.sh b/eng/testing/WasiRunnerAOTTemplate.sh
diff --git a/eng/testing/WasiRunnerTemplate.sh b/eng/testing/WasiRunnerTemplate.sh
@@ -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 ============================= 

diff --git a/eng/testing/WasmRunnerAOTTemplate.sh b/eng/testing/WasmRunnerAOTTemplate.sh
diff --git a/eng/testing/WasmRunnerTemplate.cmd b/eng/testing/WasmRunnerTemplate.cmd
@@ -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