Enable System.Runtime.Tests on WASI

Author: SingleAccretion

eng/testing/FindWasmHostExecutable.cmd

@@ -27,7 +27,7 @@ if exist "%__WasmBinaryPathWithoutExtension%.js" (
 
 if "%__WasmBinaryExtension%" == ".wasm" (
   :: Assume wasmtime is in PATH.
-  set WASM_HOST_EXECUTABLE=wasmtime run -S http
+  set WASM_HOST_EXECUTABLE=wasmtime run -S http --dir=.
 ) else (
   if "%NODEJS_EXECUTABLE%" == "" (
     :: When running tests locally, assume NodeJS is in PATH.

eng/testing/FindWasmHostExecutable.sh

@@ -21,6 +21,6 @@ elif [ -e "${dirname}/main.mjs" ]; then
   WASM_HOST_EXECUTABLE=$node
   WASM_BINARY_TO_EXECUTE="${dirname}/main.mjs"
 elif [ -e "${dirname}/${exename}.wasm" ]; then
-  WASM_HOST_EXECUTABLE="wasmtime run -S http"
+  WASM_HOST_EXECUTABLE="wasmtime run -S http --dir=."
   WASM_BINARY_TO_EXECUTE="${dirname}/${exename}.wasm"
 fi

eng/testing/tests.singlefile.targets

@@ -45,6 +45,7 @@
 
   <PropertyGroup Condition="'$(PublishSingleFile)' == 'true' or '$(TestNativeAot)' == 'true'">
     <DefineConstants>$(DefineConstants);SINGLE_FILE_TEST_RUNNER</DefineConstants>
+    <DefineConstants Condition="'$(TargetsWasi)' == 'true'">$(DefineConstants);TARGET_WASI</DefineConstants> <!-- Used by WasmTestRunner.cs -->
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TestReadyToRun)' == 'true'">

src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Threading/PeriodicTimerTests.cs

@@ -7,7 +7,7 @@
 
 namespace System.Threading.Tests
 {
-    [ActiveIssue("https://github.com/dotnet/runtimelab/issues/2505", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot), nameof(PlatformDetection.IsWasm))]
+    [ActiveIssue("https://github.com/dotnet/runtimelab/issues/2505", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot), nameof(PlatformDetection.IsBrowser))]
     public class PeriodicTimerTests
     {
         [Fact]

src/libraries/tests.proj

@@ -613,8 +613,7 @@
     <SmokeTestProject Remove="@(SmokeTestProject)" />
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Collections.Specialized\tests\System.Collections.Specialized.Tests.csproj" />
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Diagnostics.StackTrace\tests\System.Diagnostics.StackTrace.Tests.csproj" />
-    <!-- S.R.Tests aren't yet passing upstream on WASI. -->
-    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests\System.Runtime.Tests.csproj" Condition="'$(TargetsBrowser)' == 'true'" />
+    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests\System.Runtime.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(WasmEnableThreads)' == 'true'">