diff --git a/tests/xharness/Harness.cs b/tests/xharness/Harness.cs index 7572a4e875..b07babd5f9 100644 --- a/tests/xharness/Harness.cs +++ b/tests/xharness/Harness.cs @@ -373,13 +373,15 @@ namespace Xharness { void AutoConfigureIOS () { - var test_suites = new string [] { "monotouch-test" }; var library_projects = new string [] { "BundledResources", "EmbeddedResources", "bindings-test2", "bindings-framework-test", "bindings-xcframework-test" }; var fsharp_test_suites = new string [] { "fsharp" }; var fsharp_library_projects = new string [] { "fsharplibrary" }; - foreach (var p in test_suites) - IOSTestProjects.Add (new iOSTestProject (Path.GetFullPath (Path.Combine (RootDirectory, p + "/" + p + ".csproj"))) { Name = p }); + IOSTestProjects.Add (new iOSTestProject (Path.GetFullPath (Path.Combine (RootDirectory, "monotouch-test", "monotouch-test.csproj"))) { + Name = "monotouch-test", + IgnoreMacCatalystVariation = false, + }); + foreach (var p in fsharp_test_suites) IOSTestProjects.Add (new iOSTestProject (Path.GetFullPath (Path.Combine (RootDirectory, p + "/" + p + ".fsproj"))) { Name = p }); foreach (var p in library_projects) diff --git a/tests/xharness/Jenkins/Jenkins.cs b/tests/xharness/Jenkins/Jenkins.cs index 87f524b0f3..c2d87e9bf3 100644 --- a/tests/xharness/Jenkins/Jenkins.cs +++ b/tests/xharness/Jenkins/Jenkins.cs @@ -61,7 +61,7 @@ namespace Xharness.Jenkins { public bool IncludeNonMonotouch = true; public bool IncludeMonotouch = true; public bool IncludeDotNet; - public bool IncludeMacCatalyst; + public bool IncludeMacCatalyst = true; public bool CleanSuccessfulTestRuns = true; public bool UninstallTestApp = true; @@ -256,7 +256,7 @@ namespace Xharness.Jenkins { if (!project.GenerateVariations) continue; - var ignored = project.Ignore ?? !IncludeMacCatalyst; + var ignored = project.Ignore ?? !IncludeMacCatalyst || project.IgnoreMacCatalystVariation; if (!IsIncluded (project)) ignored = true; diff --git a/tests/xharness/iOSTestProject.cs b/tests/xharness/iOSTestProject.cs index 027ef391cc..f56c9b6fbf 100644 --- a/tests/xharness/iOSTestProject.cs +++ b/tests/xharness/iOSTestProject.cs @@ -11,6 +11,7 @@ namespace Xharness { public bool SkipwatchOS32Variation; public bool SkiptvOSVariation; public bool SkipMacCatalystVariation; + public bool IgnoreMacCatalystVariation = true; public bool SkipTodayExtensionVariation; public bool SkipDeviceVariations; public bool BuildOnly; @@ -45,6 +46,8 @@ namespace Xharness { rv.SkiptvOSVariation = SkiptvOSVariation; rv.SkipTodayExtensionVariation = SkipTodayExtensionVariation; rv.SkipDeviceVariations = SkipDeviceVariations; + rv.SkipMacCatalystVariation = SkipMacCatalystVariation; + rv.IgnoreMacCatalystVariation = IgnoreMacCatalystVariation; rv.BuildOnly = BuildOnly; return rv; }