From c19b2ec1bf91e31b0355dc6b4151600fe6759d80 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 30 Sep 2020 09:28:51 +0200
Subject: [PATCH] [xharness] Disable iOS 32-bit simulator tests, they don't
 work on Xcode 12+. (Re)fixes #xamarin/maccore@2284.

Fixes https://github.com/xamarin/maccore/issues/2284.
---
 tests/xharness/Jenkins/TestVariationsFactory.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/xharness/Jenkins/TestVariationsFactory.cs b/tests/xharness/Jenkins/TestVariationsFactory.cs
index 838929d2499f..e988c9c63545 100644
--- a/tests/xharness/Jenkins/TestVariationsFactory.cs
+++ b/tests/xharness/Jenkins/TestVariationsFactory.cs
@@ -91,6 +91,9 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
 				}
 				break;
 			case "iPhoneSimulator":
+				if (test.Platform == TestPlatform.iOS_Unified32)
+					ignore = true;
+
 				switch (test.TestName) {
 				case "monotouch-test":
 					// The default is to run monotouch-test with the dynamic registrar (in the simulator), so that's already covered
@@ -105,7 +108,7 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
 							Variation = $"Debug ({test.Platform.GetSimulatorMinVersion ()})",
 							Debug = true,
 							Candidates = jenkins.Simulators.SelectDevices (target, jenkins.SimulatorLoadLog, true),
-							Ignored = !jenkins.IncludeOldSimulatorTests, 
+							Ignored = ignore ?? !jenkins.IncludeOldSimulatorTests, 
 						};
 					break;
 				}