From 69b45d77e9aa7d8a25fe2ddf7bed86454cd065f8 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 1 Oct 2024 01:27:22 +0200 Subject: [PATCH] [release/8.0.1xx-xcode16.0] [tests] Ignore a few tests that fail on desktop/arm64. Ref: https://github.com/xamarin/xamarin-macios/issues/19781 Also remove some outdated watchOS ignores. Backport of #21322, #21403 and #21451. --- .../ObjCRuntime/RegistrarTestGenerated.cs | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/tests/monotouch-test/ObjCRuntime/RegistrarTestGenerated.cs b/tests/monotouch-test/ObjCRuntime/RegistrarTestGenerated.cs index f1d9f7930ab0..6028436dfef1 100644 --- a/tests/monotouch-test/ObjCRuntime/RegistrarTestGenerated.cs +++ b/tests/monotouch-test/ObjCRuntime/RegistrarTestGenerated.cs @@ -1,3 +1,4 @@ +using ObjCRuntime; using System.Runtime.CompilerServices; using NUnit.Framework; @@ -8,13 +9,28 @@ public partial class RegistrarTestGenerated { void AssertIfIgnored ([CallerMemberName] string testCase = null) { switch (testCase) { -#if __WATCHOS__ - case "Test_c": - case "Test_cc": - case "Test_ccc": - case "Test_s": - case "Test_sss": - Assert.Ignore ("https://github.com/mono/mono/issues/8486"); +#if __MACCATALYST__ || __IOS__ || __TVOS__ + case "NSNumberBindAs_Boolean_Array_Overrides": + case "NSNumberBindAs_Byte_Array_Overrides": + case "NSNumberBindAs_Double_Array_Overrides": + case "NSNumberBindAs_Int16_Array_Overrides": + case "NSNumberBindAs_Int32_Array_Overrides": + case "NSNumberBindAs_Int64_Array_Overrides": + case "NSNumberBindAs_nint_Array_Overrides": + case "NSNumberBindAs_NSStreamStatus_Array_Overrides": + case "NSNumberBindAs_nuint_Array_Overrides": + case "NSNumberBindAs_SByte_Array_Overrides": + case "NSNumberBindAs_Single_Array_Overrides": + case "NSNumberBindAs_UInt16_Array_Overrides": + case "NSNumberBindAs_UInt32_Array_Overrides": + case "NSNumberBindAs_UInt64_Array_Overrides": + // https://github.com/xamarin/xamarin-macios/issues/19781 +#if __MACCATALYST__ + if (Runtime.IsARM64CallingConvention) +#elif __IOS__ || __TVOS__ + if (Runtime.IsARM64CallingConvention && Runtime.Arch == Arch.SIMULATOR) +#endif + Assert.Ignore ("https://github.com/xamarin/xamarin-macios/issues/19781"); break; #endif default: