From 8229cb34377bc9945403424003e70d13925e25e9 Mon Sep 17 00:00:00 2001 From: lateralusX Date: Thu, 31 Jul 2025 10:47:18 +0200 Subject: [PATCH 1/2] Disable test on NAOT due to no support for alertable waits. --- src/tests/baseservices/threading/regressions/115178/115178.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/baseservices/threading/regressions/115178/115178.cs b/src/tests/baseservices/threading/regressions/115178/115178.cs index 3e8608e9102634..90f050390c26df 100644 --- a/src/tests/baseservices/threading/regressions/115178/115178.cs +++ b/src/tests/baseservices/threading/regressions/115178/115178.cs @@ -16,7 +16,7 @@ as a result of internal interrupt handling. public class Test_wait_interrupted_user_apc { - public static bool Run115178Test => TestLibrary.Utilities.IsWindows; + public static bool Run115178Test => TestLibrary.Utilities.IsWindows && !TestLibrary.Utilities.IsNativeAot; [DllImport("kernel32.dll")] private static extern IntPtr GetCurrentProcess(); From 723ebb436027d37ee3a735e9ea6c1691fe239f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Thu, 31 Jul 2025 12:27:50 +0200 Subject: [PATCH 2/2] Update 115178.cs --- .../baseservices/threading/regressions/115178/115178.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/tests/baseservices/threading/regressions/115178/115178.cs b/src/tests/baseservices/threading/regressions/115178/115178.cs index 90f050390c26df..5a9fdd46265c4d 100644 --- a/src/tests/baseservices/threading/regressions/115178/115178.cs +++ b/src/tests/baseservices/threading/regressions/115178/115178.cs @@ -16,8 +16,6 @@ as a result of internal interrupt handling. public class Test_wait_interrupted_user_apc { - public static bool Run115178Test => TestLibrary.Utilities.IsWindows && !TestLibrary.Utilities.IsNativeAot; - [DllImport("kernel32.dll")] private static extern IntPtr GetCurrentProcess(); @@ -285,7 +283,8 @@ private static void RunTestInterruptInfiniteWait() GC.KeepAlive(callback); } - [ConditionalFact(nameof(Run115178Test))] + [ConditionalFact(typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsWindows))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/118233", typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsNativeAot))] public static int TestEntryPoint() { RunTestUsingInfiniteWait();