diff --git a/tests/xharness/Harness.cs b/tests/xharness/Harness.cs index 4068a77d3f..df302157bd 100644 --- a/tests/xharness/Harness.cs +++ b/tests/xharness/Harness.cs @@ -364,7 +364,8 @@ namespace xharness var monoNativeInfo = new MonoNativeInfo (this, flavor); var iosTestProject = new iOSTestProject (monoNativeInfo.ProjectPath, generateVariations: false) { MonoNativeInfo = monoNativeInfo, - Name = monoNativeInfo.ProjectName + Name = monoNativeInfo.ProjectName, + SkipwatchOSARM64_32Variation = monoNativeInfo.ProjectName.Contains ("compat"), }; IOSTestProjects.Add (iosTestProject); diff --git a/tests/xharness/Jenkins.cs b/tests/xharness/Jenkins.cs index 9b4a79e8ed..b61db2b48e 100644 --- a/tests/xharness/Jenkins.cs +++ b/tests/xharness/Jenkins.cs @@ -606,16 +606,18 @@ namespace xharness buildWatch32.CloneTestProject (watchOSProject); rv.Add (new RunDeviceTask (buildWatch32, Devices.ConnectedWatch) { Ignored = ignored || !IncludewatchOS, BuildOnly = project.BuildOnly }); - var buildWatch64_32 = new XBuildTask { - Jenkins = this, - ProjectConfiguration = "Debug64_32", - ProjectPlatform = "iPhone", - Platform = TestPlatform.watchOS_64_32, - TestName = project.Name, - Ignored = true, - }; - buildWatch64_32.CloneTestProject (watchOSProject); - rv.Add (new RunDeviceTask (buildWatch64_32, Devices.ConnectedWatch32_64.Where (d => d.IsSupported (project))) { Ignored = ignored || !IncludewatchOS, BuildOnly = project.BuildOnly }); + if (!project.SkipwatchOSARM64_32Variation) { + var buildWatch64_32 = new XBuildTask { + Jenkins = this, + ProjectConfiguration = "Debug64_32", + ProjectPlatform = "iPhone", + Platform = TestPlatform.watchOS_64_32, + TestName = project.Name, + Ignored = true, + }; + buildWatch64_32.CloneTestProject (watchOSProject); + rv.Add (new RunDeviceTask (buildWatch64_32, Devices.ConnectedWatch32_64.Where (d => d.IsSupported (project))) { Ignored = ignored || !IncludewatchOS, BuildOnly = project.BuildOnly }); + } } } diff --git a/tests/xharness/TestProject.cs b/tests/xharness/TestProject.cs index 9d845c318f..abf985628d 100644 --- a/tests/xharness/TestProject.cs +++ b/tests/xharness/TestProject.cs @@ -150,6 +150,7 @@ namespace xharness { public bool SkipiOSVariation; public bool SkipwatchOSVariation; + public bool SkipwatchOSARM64_32Variation; public bool SkiptvOSVariation; public bool BuildOnly;