Skip to content

Commit 2ea6ef0

Browse files
committed
Some more matrix testing of msquic presence
1 parent f9241c4 commit 2ea6ef0

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public static partial class PlatformDetection
1919
public static bool IsUbuntu => IsDistroAndVersion("ubuntu");
2020
public static bool IsDebian => IsDistroAndVersion("debian");
2121
public static bool IsAlpine => IsDistroAndVersion("alpine");
22+
public static bool IsAlpine314 => IsDistroAndVersion("alpine", 3, 14);
2223
public static bool IsDebian8 => IsDistroAndVersion("debian", 8);
2324
public static bool IsDebian9 => IsDistroAndVersion("debian", 9);
2425
public static bool IsDebian10 => IsDistroAndVersion("debian", 10);

src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ private static bool GetLinqExpressionsBuiltWithIsInterpretingOnly()
152152
public static bool IsLineNumbersSupported => !IsNativeAot;
153153

154154
public static bool IsInContainer => GetIsInContainer();
155+
public static bool IsNotInContainer => !IsInContainer;
155156
public static bool SupportsComInterop => IsWindows && IsNotMonoRuntime && !IsNativeAot; // matches definitions in clr.featuredefines.props
156157

157158
#if NETCOREAPP

src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,11 @@ public async Task SupportedLinuxPlatformsWithMsquic_IsSupportedIsTrue()
5151
}
5252
}
5353

54-
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsLinux), nameof(PlatformDetection.IsInContainer))]
54+
//[ActiveIssue("https://github.com/dotnet/runtime/issues/xxxxx", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine314))]
55+
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsLinux))]
5556
public void SupportedLinuxPlatforms_IsSupportedIsTrue()
5657
{
58+
_output.WriteLine($"Running on {PlatformDetection.GetDistroVersionString()}");
5759
Assert.True(QuicListener.IsSupported);
5860
Assert.True(QuicConnection.IsSupported);
5961
}

0 commit comments

Comments
 (0)