Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new WASI RID #11641

Merged
merged 2 commits into from
Nov 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Microsoft.DotNet.RemoteExecutor/src/RemoteExecutor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ private static bool IsNetCore() =>
!RuntimeInformation.IsOSPlatform(OSPlatform.Create("MACCATALYST")) &&
!RuntimeInformation.IsOSPlatform(OSPlatform.Create("WATCHOS")) &&
!RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER")) &&
!RuntimeInformation.IsOSPlatform(OSPlatform.Create("WASI")) &&
// The current RemoteExecutor design is not compatible with single file
!string.IsNullOrEmpty(typeof(RemoteExecutor).Assembly.Location) &&
Environment.GetEnvironmentVariable("DOTNET_REMOTEEXECUTOR_SUPPORTED") != "0";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public static bool TestPlatformApplies(TestPlatforms platforms) =>
(platforms.HasFlag(TestPlatforms.LinuxBionic) && RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) && !String.IsNullOrEmpty(Environment.GetEnvironmentVariable("ANDROID_STORAGE")) ||
(platforms.HasFlag(TestPlatforms.Android) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("ANDROID"))) ||
(platforms.HasFlag(TestPlatforms.Browser) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER"))) ||
(platforms.HasFlag(TestPlatforms.Wasi) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("WASI"))) ||
(platforms.HasFlag(TestPlatforms.Windows) && RuntimeInformation.IsOSPlatform(OSPlatform.Windows));

public static bool TestRuntimeApplies(TestRuntimes runtimes) =>
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.XUnitExtensions/src/TestPlatforms.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ public enum TestPlatforms
Browser = 1024,
MacCatalyst = 2048,
LinuxBionic = 4096,
AnyUnix = FreeBSD | Linux | NetBSD | OSX | illumos | Solaris | iOS | tvOS | MacCatalyst | Android | Browser | LinuxBionic,
Wasi = 8192,
AnyUnix = FreeBSD | Linux | NetBSD | OSX | illumos | Solaris | iOS | tvOS | MacCatalyst | Android | Browser | LinuxBionic | Wasi,
Any = ~0
}
}