From f76d334167406f3819968fc560a7ecd80c8ba270 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Thu, 9 May 2024 22:22:52 -0700 Subject: [PATCH 1/2] Disable tests failing on NAOT --- .../JIT/Methodical/doublearray/dblarray1.cs | 1 + .../JIT/Methodical/doublearray/dblarray2.cs | 1 + .../JIT/Methodical/doublearray/dblarray3.cs | 1 + .../JIT/Methodical/doublearray/dblarray4.cs | 1 + src/tests/JIT/Methodical/refany/array2.cs | 1 - src/tests/JIT/Methodical/refany/array2.il | 20 +++++++++++++++++++ src/tests/issues.targets | 15 -------------- 7 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/tests/JIT/Methodical/doublearray/dblarray1.cs b/src/tests/JIT/Methodical/doublearray/dblarray1.cs index ced602459a949..7c377fc857926 100644 --- a/src/tests/JIT/Methodical/doublearray/dblarray1.cs +++ b/src/tests/JIT/Methodical/doublearray/dblarray1.cs @@ -94,6 +94,7 @@ public static void Run(Action f) [Fact] [SkipOnCoreClr("This test is not compatible with GCStress.", RuntimeTestModes.AnyGCStress)] [OuterLoop] + [ActiveIssue("https://github.com/dotnet/runtime/issues/101284", typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsNativeAot))] public static int TestEntryPoint() { if (RuntimeInformation.ProcessArchitecture == Architecture.X86) diff --git a/src/tests/JIT/Methodical/doublearray/dblarray2.cs b/src/tests/JIT/Methodical/doublearray/dblarray2.cs index b88453fab63eb..427b72d15b47a 100644 --- a/src/tests/JIT/Methodical/doublearray/dblarray2.cs +++ b/src/tests/JIT/Methodical/doublearray/dblarray2.cs @@ -283,6 +283,7 @@ public static void Run(Action f) [Fact] [SkipOnCoreClr("This test is not compatible with GCStress.", RuntimeTestModes.AnyGCStress)] [SkipOnMono("Needs triage")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/101284", typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsNativeAot))] public static int TestEntryPoint() { if (RuntimeInformation.ProcessArchitecture == Architecture.X86) diff --git a/src/tests/JIT/Methodical/doublearray/dblarray3.cs b/src/tests/JIT/Methodical/doublearray/dblarray3.cs index 7852d780ecdd5..053e1c14700ec 100644 --- a/src/tests/JIT/Methodical/doublearray/dblarray3.cs +++ b/src/tests/JIT/Methodical/doublearray/dblarray3.cs @@ -144,6 +144,7 @@ public static void Run(Action f) [SkipOnCoreClr("This test is not compatible with GCStress.", RuntimeTestModes.AnyGCStress)] [SkipOnMono("Needs triage")] [OuterLoop] + [ActiveIssue("https://github.com/dotnet/runtime/issues/101284", typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsNativeAot))] public static int TestEntryPoint() { Console.WriteLine(RuntimeInformation.ProcessArchitecture); diff --git a/src/tests/JIT/Methodical/doublearray/dblarray4.cs b/src/tests/JIT/Methodical/doublearray/dblarray4.cs index f5d07fe0d753e..748bf3de2fa2b 100644 --- a/src/tests/JIT/Methodical/doublearray/dblarray4.cs +++ b/src/tests/JIT/Methodical/doublearray/dblarray4.cs @@ -22,6 +22,7 @@ public class DblArray4 [Fact] [SkipOnCoreClr("This test is not compatible with GCStress.", RuntimeTestModes.AnyGCStress)] [OuterLoop] + [ActiveIssue("https://github.com/dotnet/runtime/issues/101284", typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsNativeAot))] public static int TestEntryPoint() { if (RuntimeInformation.ProcessArchitecture == Architecture.X86) diff --git a/src/tests/JIT/Methodical/refany/array2.cs b/src/tests/JIT/Methodical/refany/array2.cs index ea502125452f5..9db5f90ef8361 100644 --- a/src/tests/JIT/Methodical/refany/array2.cs +++ b/src/tests/JIT/Methodical/refany/array2.cs @@ -25,7 +25,6 @@ private static void TestRef(TypedReference _ref) [Fact] [OuterLoop] - [ActiveIssue("https://github.com/dotnet/runtimelab/issues/155", typeof(PlatformDetection), nameof(PlatformDetection.IsNonZeroLowerBoundArrayNotSupported))] public static int TestEntryPoint() { ulong[,] aul2 = new ulong[,] { { 1, 2, 3 }, { 4, 5, 6 } }; diff --git a/src/tests/JIT/Methodical/refany/array2.il b/src/tests/JIT/Methodical/refany/array2.il index 5e88f1b5c1787..90aad1276d91f 100644 --- a/src/tests/JIT/Methodical/refany/array2.il +++ b/src/tests/JIT/Methodical/refany/array2.il @@ -11,6 +11,11 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern Microsoft.DotNet.XUnitExtensions +{ + .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) + .ver 9:0:0:0 +} .assembly ASSEMBLY_NAME { } @@ -125,6 +130,21 @@ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 ) + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ActiveIssueAttribute::.ctor(string, + class [mscorlib]System.Type, + string[]) = ( 01 00 2F 68 74 74 70 73 3A 2F 2F 67 69 74 68 75 // ../https://githu + 62 2E 63 6F 6D 2F 64 6F 74 6E 65 74 2F 72 75 6E // b.com/dotnet/run + 74 69 6D 65 6C 61 62 2F 69 73 73 75 65 73 2F 31 // timelab/issues/1 + 35 35 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // 55aTestLibrary.P + 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection + 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V + 65 72 73 69 6F 6E 3D 30 2E 30 2E 30 2E 30 2C 20 // ersion=0.0.0.0, + 43 75 6C 74 75 72 65 3D 6E 65 75 74 72 61 6C 2C // Culture=neutral, + 20 50 75 62 6C 69 63 4B 65 79 54 6F 6B 65 6E 3D // PublicKeyToken= + 6E 75 6C 6C 01 00 00 00 24 49 73 4E 6F 6E 5A 65 // null....$IsNonZe + 72 6F 4C 6F 77 65 72 42 6F 75 6E 64 41 72 72 61 // roLowerBoundArra + 79 4E 6F 74 53 75 70 70 6F 72 74 65 64 00 00 ) // yNotSupported.. + .entrypoint // Code size 150 (0x96) .maxstack 4 diff --git a/src/tests/issues.targets b/src/tests/issues.targets index 21a49cefcc3a6..f035f47f112a6 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -1152,21 +1152,6 @@ - - https://github.com/dotnet/runtime/issues/101284 - - - https://github.com/dotnet/runtime/issues/101284 - - - https://github.com/dotnet/runtime/issues/101284 - - - https://github.com/dotnet/runtime/issues/101284 - - - https://github.com/dotnet/runtime/issues/101284 - https://github.com/dotnet/runtime/issues/101284 From 31dc9228c8d2bbb2975d7d802d568958168645cb Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Fri, 10 May 2024 22:58:46 -0700 Subject: [PATCH 2/2] Try to fix build --- src/tests/JIT/Methodical/refany/array2.il | 35 +++++++++++------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/src/tests/JIT/Methodical/refany/array2.il b/src/tests/JIT/Methodical/refany/array2.il index 90aad1276d91f..77ebee43c117b 100644 --- a/src/tests/JIT/Methodical/refany/array2.il +++ b/src/tests/JIT/Methodical/refany/array2.il @@ -11,15 +11,13 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly extern Microsoft.DotNet.XUnitExtensions -{ - .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) - .ver 9:0:0:0 -} +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly ASSEMBLY_NAME { } .assembly extern xunit.core {} +.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) } +.assembly extern TestLibrary {} // MVID: {1781A471-82F3-4159-8D0F-B3B5A9FF1BB6} .namespace JitTest_array2_refany_il { @@ -130,20 +128,21 @@ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 ) + // [ActiveIssue("https://github.com/dotnet/runtimelab/issues/155", typeof(PlatformDetection), nameof(PlatformDetection.IsNonZeroLowerBoundArrayNotSupported))] .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ActiveIssueAttribute::.ctor(string, - class [mscorlib]System.Type, - string[]) = ( 01 00 2F 68 74 74 70 73 3A 2F 2F 67 69 74 68 75 // ../https://githu - 62 2E 63 6F 6D 2F 64 6F 74 6E 65 74 2F 72 75 6E // b.com/dotnet/run - 74 69 6D 65 6C 61 62 2F 69 73 73 75 65 73 2F 31 // timelab/issues/1 - 35 35 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // 55aTestLibrary.P - 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection - 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V - 65 72 73 69 6F 6E 3D 30 2E 30 2E 30 2E 30 2C 20 // ersion=0.0.0.0, - 43 75 6C 74 75 72 65 3D 6E 65 75 74 72 61 6C 2C // Culture=neutral, - 20 50 75 62 6C 69 63 4B 65 79 54 6F 6B 65 6E 3D // PublicKeyToken= - 6E 75 6C 6C 01 00 00 00 24 49 73 4E 6F 6E 5A 65 // null....$IsNonZe - 72 6F 4C 6F 77 65 72 42 6F 75 6E 64 41 72 72 61 // roLowerBoundArra - 79 4E 6F 74 53 75 70 70 6F 72 74 65 64 00 00 ) // yNotSupported.. + class [System.Runtime]System.Type, + string[]) = ( 01 00 2F 68 74 74 70 73 3A 2F 2F 67 69 74 68 75 + 62 2E 63 6F 6D 2F 64 6F 74 6E 65 74 2F 72 75 6E + 74 69 6D 65 6C 61 62 2F 69 73 73 75 65 73 2F 31 + 35 35 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 + 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E + 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 + 65 72 73 69 6F 6E 3D 30 2E 30 2E 30 2E 30 2C 20 + 43 75 6C 74 75 72 65 3D 6E 65 75 74 72 61 6C 2C + 20 50 75 62 6C 69 63 4B 65 79 54 6F 6B 65 6E 3D + 6E 75 6C 6C 01 00 00 00 24 49 73 4E 6F 6E 5A 65 + 72 6F 4C 6F 77 65 72 42 6F 75 6E 64 41 72 72 61 + 79 4E 6F 74 53 75 70 70 6F 72 74 65 64 00 00 ) .entrypoint // Code size 150 (0x96)