update runtime tests to work with WASIp2

As of this writing, WASIp2 [does not support process exit
statuses](WebAssembly/wasi-cli#11) beyond 0 (success)
and 1 (failure).  To work around this, I've modified the relevant tests to
return 0 on success instead of 100.

Signed-off-by: Joel Dice <[email protected]>

Author: dicej

eng/pipelines/common/global-build-job.yml

@@ -225,6 +225,8 @@ jobs:
         displayName: Install wasi-sdk
       - script: call $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-wasmtime.cmd $(Build.SourcesDirectory)\wasm-tools
         displayName: Install wasmtime
+      - script: npm install -g @bytecodealliance/jco
+        displayName: Install jco
 
     - ${{ if or(eq(parameters.platform, 'browser_wasm_win'), and(eq(parameters.platform, 'wasi_wasm_win'), not(eq(parameters.runtimeFlavor, 'coreclr')))) }}:
       # Update machine certs

src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/generate-bindings.sh

@@ -11,10 +11,10 @@ set -ex
 #   [cargo](https://rustup.rs/)
 #   [curl](https://curl.se/download.html)
 
-# TODO: Upstream the changes in this `wit-bindgen` fork and use a crates.io
-# release instead:
+# TODO: Use a crates.io release instead of the Git repo once a release
+# containing this commit has been created:
 cargo install --locked --no-default-features --features csharp-naot \
-      --git https://github.com/dicej/wit-bindgen --branch dotnet \
+      --git https://github.com/bytecodealliance/wit-bindgen --rev 266d638f7a9c4535ba5fa1f1bb2e8cc6b5d58667 \
       wit-bindgen-cli
 curl -OL https://github.com/WebAssembly/wasi-http/archive/refs/tags/v0.2.0.tar.gz
 tar xzf v0.2.0.tar.gz

src/libraries/System.Private.CoreLib/src/System/WASIp2/generate-bindings.sh

@@ -11,10 +11,10 @@ set -ex
 #   [cargo](https://rustup.rs/)
 #   [curl](https://curl.se/download.html)
 
-# TODO: Upstream the changes in this `wit-bindgen` fork and use a crates.io
-# release instead:
+# TODO: Use a crates.io release instead of the Git repo once a release
+# containing this commit has been created:
 cargo install --locked --no-default-features --features csharp-naot \
-      --git https://github.com/dicej/wit-bindgen --branch dotnet \
+      --git https://github.com/bytecodealliance/wit-bindgen --rev 266d638f7a9c4535ba5fa1f1bb2e8cc6b5d58667 \
       wit-bindgen-cli
 curl -OL https://github.com/WebAssembly/wasi-http/archive/refs/tags/v0.2.0.tar.gz
 tar xzf v0.2.0.tar.gz

src/tests/Common/scripts/nativeaottest.sh

@@ -12,11 +12,13 @@
 
 exename=$(basename $2 .dll)
 wasm="$1/native/${exename}.wasm"
+mjs="$1/native/${exename}.mjs"
 
-if [ -e "$wasm" ]; then
-  shift 2
-  echo wasmtime run -S http "$wasm" "$@"
-  wasmtime run -S http "$wasm" "$@"
+if [ -e "$mjs" ]; then
+  node "$mjs" "${@:3}"
+elif [ -e "$wasm" ]; then
+  echo wasmtime run -S http "$wasm" "${@:3}"
+  wasmtime run -S http "$wasm" "${@:3}"
 else
   chmod +x $1/native/$exename
   $_DebuggerFullPath $1/native/$exename "${@:3}"

src/tests/nativeaot/CustomMain/CustomMain.cs

@@ -35,6 +35,6 @@ static void IncrementExitCode(int amount)
     static int Main(string[] args)
     {
         Console.WriteLine("hello from managed main");
-        return s_exitCode;
+        return s_exitCode - 100;
     }
 }

src/tests/nativeaot/CustomMain/CustomMain.csproj

@@ -6,6 +6,7 @@
 
     <!-- TODO-LLVM: Remove when https://github.com/WebAssembly/wasi-sdk/issues/367 is resolved -->
     <EmccExtraArgs Condition="'$(TargetOS)' == 'wasi'">-Wl,--export-if-defined=__main_argc_argv</EmccExtraArgs>
+    <CLRTestExitCode>0</CLRTestExitCode>
   </PropertyGroup>
 
   <ItemGroup>

src/tests/nativeaot/SmokeTests/DynamicGenerics/DynamicGenerics.csproj

@@ -10,6 +10,7 @@
 
     <!-- Look for MULTIMODULE_BUILD #define for the more specific incompatible parts -->
     <CLRTestTargetUnsupported Condition="'$(IlcMultiModule)' == 'true'">true</CLRTestTargetUnsupported>
+    <CLRTestExitCode>0</CLRTestExitCode>
   </PropertyGroup>
 
   <ItemGroup>

src/tests/nativeaot/SmokeTests/DynamicGenerics/DynamicGenerics.main.cs

@@ -165,7 +165,7 @@ public static int Main(string[] args)
         if (passed && CoreFXTestLibrary.Internal.Runner.NumPassedTests > 0)
         {
             CoreFXTestLibrary.Logger.LogInformation("All tests PASSED.");
-            return 100;
+            return 0;
         }
         else
         {

src/tests/nativeaot/SmokeTests/Exceptions/Exceptions.cs

@@ -9,7 +9,7 @@
 
 public class BringUpTest
 {
-    const int Pass = 100;
+    const int Pass = 0;
     const int Fail = -1;
 
     volatile int myField;

src/tests/nativeaot/SmokeTests/Exceptions/Exceptions.csproj

@@ -6,6 +6,7 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <!-- Test infra issue on apple devices: https://github.com/dotnet/runtime/issues/89917 -->
     <CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
+    <CLRTestExitCode>0</CLRTestExitCode>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Exceptions.cs" />