From 532d9a6302427fbab307cb31dada5edfbb3b5447 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Tue, 26 Mar 2024 17:26:26 -0700 Subject: [PATCH 1/2] Testing naot test failure --- src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/Program.cs | 2 +- src/tests/Interop/PInvoke/Decimal/DecimalTest.cs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/Program.cs b/src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/Program.cs index d1d273c885de88..abfc0a1e96a859 100644 --- a/src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/Program.cs +++ b/src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/Program.cs @@ -370,7 +370,7 @@ static void DEL_ThrowExceptionException(int _) { // Not yet implemented For NativeAOT. // https://github.com/dotnet/runtime/issues/80985 - if (!TestLibrary.Utilities.IsNativeAot) + // if (!TestLibrary.Utilities.IsNativeAot) { var lastMethod = (MethodInfo)MethodBase.GetMethodFromHandle(lastMethodHandle); Assert.True(lastMethod != null); diff --git a/src/tests/Interop/PInvoke/Decimal/DecimalTest.cs b/src/tests/Interop/PInvoke/Decimal/DecimalTest.cs index 25a0f4a3747f81..38048d978dc557 100644 --- a/src/tests/Interop/PInvoke/Decimal/DecimalTest.cs +++ b/src/tests/Interop/PInvoke/Decimal/DecimalTest.cs @@ -41,7 +41,6 @@ public static void RunDecimalTests() } [Fact] - [ActiveIssue("https://github.com/dotnet/runtimelab/issues/175", typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsNativeAot))] public static void RunLPDecimalTests() { Assert.Equal((decimal)StartingIntValue, DecimalTestNative.CreateLPDecimalFromInt(StartingIntValue)); @@ -60,7 +59,6 @@ public static void RunLPDecimalTests() [Fact] [PlatformSpecific(TestPlatforms.Windows)] - [ActiveIssue("https://github.com/dotnet/runtimelab/issues/175", typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsNativeAot))] public static void RunCurrencyTests() { Assert.Throws(() => DecimalTestNative.CreateCurrencyFromInt(StartingIntValue)); From 7bd8dfc45c40e67d3413b58eff93e225ab9df2df Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Tue, 26 Mar 2024 21:06:50 -0700 Subject: [PATCH 2/2] One more --- src/tests/baseservices/callconvs/TestCallingConventions.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tests/baseservices/callconvs/TestCallingConventions.cs b/src/tests/baseservices/callconvs/TestCallingConventions.cs index ad8b08d0bf1536..3cbb43f9c8e77b 100644 --- a/src/tests/baseservices/callconvs/TestCallingConventions.cs +++ b/src/tests/baseservices/callconvs/TestCallingConventions.cs @@ -167,6 +167,9 @@ static void NonblittableFunctionPointers() [Fact] public static int TestEntryPoint() { + if (string.IsNullOrEmpty(typeof(object).Assembly.Location)) + return 3989374; + try { BlittableFunctionPointers();