[xharness] Don't run the mono-native-compat test on ARM64_32.

ARM64_32 only supports the unified native mode.
This commit is contained in:
Rolf Bjarne Kvinge 2019-05-10 09:29:23 +02:00
Родитель c870d3303d
Коммит 281ea5f97d
3 изменённых файлов: 15 добавлений и 11 удалений

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

@ -364,7 +364,8 @@ namespace xharness
var monoNativeInfo = new MonoNativeInfo (this, flavor); var monoNativeInfo = new MonoNativeInfo (this, flavor);
var iosTestProject = new iOSTestProject (monoNativeInfo.ProjectPath, generateVariations: false) { var iosTestProject = new iOSTestProject (monoNativeInfo.ProjectPath, generateVariations: false) {
MonoNativeInfo = monoNativeInfo, MonoNativeInfo = monoNativeInfo,
Name = monoNativeInfo.ProjectName Name = monoNativeInfo.ProjectName,
SkipwatchOSARM64_32Variation = monoNativeInfo.ProjectName.Contains ("compat"),
}; };
IOSTestProjects.Add (iosTestProject); IOSTestProjects.Add (iosTestProject);

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

@ -606,16 +606,18 @@ namespace xharness
buildWatch32.CloneTestProject (watchOSProject); buildWatch32.CloneTestProject (watchOSProject);
rv.Add (new RunDeviceTask (buildWatch32, Devices.ConnectedWatch) { Ignored = ignored || !IncludewatchOS, BuildOnly = project.BuildOnly }); rv.Add (new RunDeviceTask (buildWatch32, Devices.ConnectedWatch) { Ignored = ignored || !IncludewatchOS, BuildOnly = project.BuildOnly });
var buildWatch64_32 = new XBuildTask { if (!project.SkipwatchOSARM64_32Variation) {
Jenkins = this, var buildWatch64_32 = new XBuildTask {
ProjectConfiguration = "Debug64_32", Jenkins = this,
ProjectPlatform = "iPhone", ProjectConfiguration = "Debug64_32",
Platform = TestPlatform.watchOS_64_32, ProjectPlatform = "iPhone",
TestName = project.Name, Platform = TestPlatform.watchOS_64_32,
Ignored = true, 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 }); buildWatch64_32.CloneTestProject (watchOSProject);
rv.Add (new RunDeviceTask (buildWatch64_32, Devices.ConnectedWatch32_64.Where (d => d.IsSupported (project))) { Ignored = ignored || !IncludewatchOS, BuildOnly = project.BuildOnly });
}
} }
} }

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

@ -150,6 +150,7 @@ namespace xharness
{ {
public bool SkipiOSVariation; public bool SkipiOSVariation;
public bool SkipwatchOSVariation; public bool SkipwatchOSVariation;
public bool SkipwatchOSARM64_32Variation;
public bool SkiptvOSVariation; public bool SkiptvOSVariation;
public bool BuildOnly; public bool BuildOnly;