Skip to content

Commit fd496be

Browse files
Fix AOT test skip condition (dotnet#48126)
1 parent 89a9712 commit fd496be

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/Testing/src/xunit/HelixConstants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ public static class HelixConstants
99
public const string DebianAmd64 = "Debian.11.Amd64.Open;";
1010
public const string DebianArm64 = "Debian.11.Arm64.Open;";
1111
public const string AlmaLinuxAmd64 = "(AlmaLinux.8.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:almalinux-8-helix-amd64;";
12-
public const string NativeAotNotSupportedHelixQueues = "All.OSX;All.Ubuntu;Windows.11.Amd64.Client.Open;Windows.Amd64.Server2022.Open;windows.11.arm64.open";
12+
public const string NativeAotNotSupportedHelixQueues = "All.OSX;All.Linux;Windows.11.Amd64.Client.Open;Windows.Amd64.Server2022.Open;windows.11.arm64.open";
1313
}

src/Testing/src/xunit/SkipOnHelixAttribute.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using System;
55
using System.Linq;
6+
using System.Runtime.InteropServices;
67

78
namespace Microsoft.AspNetCore.Testing;
89

@@ -61,6 +62,11 @@ private bool ShouldSkip()
6162
{
6263
return true;
6364
}
65+
66+
if (Queues.Contains("All.Linux") && RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
67+
{
68+
return true;
69+
}
6470

6571
return Queues.ToLowerInvariant().Split(';').Contains(targetQueue);
6672
}

0 commit comments

Comments
 (0)