[xharness] Run Mac Catalyst variations by default, and disable all but monotouch-test by default.

This will effectively run monotouch-test on Mac Catalyst by default.
This commit is contained in:
Rolf Bjarne Kvinge 2021-01-26 12:28:35 +01:00
Родитель d1735ae779
Коммит d9af032dd5
3 изменённых файлов: 10 добавлений и 5 удалений

Просмотреть файл

@ -373,13 +373,15 @@ namespace Xharness {
void AutoConfigureIOS () 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 library_projects = new string [] { "BundledResources", "EmbeddedResources", "bindings-test2", "bindings-framework-test", "bindings-xcframework-test" };
var fsharp_test_suites = new string [] { "fsharp" }; var fsharp_test_suites = new string [] { "fsharp" };
var fsharp_library_projects = new string [] { "fsharplibrary" }; var fsharp_library_projects = new string [] { "fsharplibrary" };
foreach (var p in test_suites) IOSTestProjects.Add (new iOSTestProject (Path.GetFullPath (Path.Combine (RootDirectory, "monotouch-test", "monotouch-test.csproj"))) {
IOSTestProjects.Add (new iOSTestProject (Path.GetFullPath (Path.Combine (RootDirectory, p + "/" + p + ".csproj"))) { Name = p }); Name = "monotouch-test",
IgnoreMacCatalystVariation = false,
});
foreach (var p in fsharp_test_suites) foreach (var p in fsharp_test_suites)
IOSTestProjects.Add (new iOSTestProject (Path.GetFullPath (Path.Combine (RootDirectory, p + "/" + p + ".fsproj"))) { Name = p }); IOSTestProjects.Add (new iOSTestProject (Path.GetFullPath (Path.Combine (RootDirectory, p + "/" + p + ".fsproj"))) { Name = p });
foreach (var p in library_projects) foreach (var p in library_projects)

Просмотреть файл

@ -61,7 +61,7 @@ namespace Xharness.Jenkins {
public bool IncludeNonMonotouch = true; public bool IncludeNonMonotouch = true;
public bool IncludeMonotouch = true; public bool IncludeMonotouch = true;
public bool IncludeDotNet; public bool IncludeDotNet;
public bool IncludeMacCatalyst; public bool IncludeMacCatalyst = true;
public bool CleanSuccessfulTestRuns = true; public bool CleanSuccessfulTestRuns = true;
public bool UninstallTestApp = true; public bool UninstallTestApp = true;
@ -256,7 +256,7 @@ namespace Xharness.Jenkins {
if (!project.GenerateVariations) if (!project.GenerateVariations)
continue; continue;
var ignored = project.Ignore ?? !IncludeMacCatalyst; var ignored = project.Ignore ?? !IncludeMacCatalyst || project.IgnoreMacCatalystVariation;
if (!IsIncluded (project)) if (!IsIncluded (project))
ignored = true; ignored = true;

Просмотреть файл

@ -11,6 +11,7 @@ namespace Xharness {
public bool SkipwatchOS32Variation; public bool SkipwatchOS32Variation;
public bool SkiptvOSVariation; public bool SkiptvOSVariation;
public bool SkipMacCatalystVariation; public bool SkipMacCatalystVariation;
public bool IgnoreMacCatalystVariation = true;
public bool SkipTodayExtensionVariation; public bool SkipTodayExtensionVariation;
public bool SkipDeviceVariations; public bool SkipDeviceVariations;
public bool BuildOnly; public bool BuildOnly;
@ -45,6 +46,8 @@ namespace Xharness {
rv.SkiptvOSVariation = SkiptvOSVariation; rv.SkiptvOSVariation = SkiptvOSVariation;
rv.SkipTodayExtensionVariation = SkipTodayExtensionVariation; rv.SkipTodayExtensionVariation = SkipTodayExtensionVariation;
rv.SkipDeviceVariations = SkipDeviceVariations; rv.SkipDeviceVariations = SkipDeviceVariations;
rv.SkipMacCatalystVariation = SkipMacCatalystVariation;
rv.IgnoreMacCatalystVariation = IgnoreMacCatalystVariation;
rv.BuildOnly = BuildOnly; rv.BuildOnly = BuildOnly;
return rv; return rv;
} }