[xharness] Add ARM64 variations for macOS/.NET using both MonoVM and CoreCLR. (#11516)

This commit is contained in:
Rolf Bjarne Kvinge 2021-05-12 15:04:14 +02:00 коммит произвёл GitHub
Родитель 82f8ca80a1
Коммит 913cbb67d7
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 10 добавлений и 2 удалений

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

@ -22,5 +22,6 @@ namespace Xharness.Jenkins {
public MonoNativeLinkMode MonoNativeLinkMode;
public IEnumerable<IDevice> Candidates;
public string XamMacArch;
public string RuntimeIdentifier;
}
}

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

@ -117,8 +117,12 @@ namespace Xharness.Jenkins {
case "x86":
switch (test.TestName) {
case "monotouch-test":
if (test.TestProject.IsDotNetProject)
yield return new TestData { Variation = "Debug (CoreCLR)", Debug = true, UseMonoRuntime = false, Ignored = true, };
if (test.TestProject.IsDotNetProject) {
var isDotNetReady = false;
yield return new TestData { Variation = "Debug (CoreCLR)", Debug = true, UseMonoRuntime = false, Ignored = !isDotNetReady || !jenkins.IncludeMac, };
yield return new TestData { Variation = "Debug (ARM64)", Debug = true, Profiling = false, Ignored = !isDotNetReady || !jenkins.IncludeMac || !mac_supports_arm64, RuntimeIdentifier = "osx-arm64", };
yield return new TestData { Variation = "Debug (CoreCLR, ARM64)", Debug = true, UseMonoRuntime = false, Profiling = false, Ignored = !isDotNetReady || !jenkins.IncludeMac || !mac_supports_arm64, RuntimeIdentifier = "osx-arm64", };
}
break;
case "xammac tests":
switch (test.ProjectConfiguration) {
@ -166,6 +170,7 @@ namespace Xharness.Jenkins {
var candidates = test_data.Candidates;
var use_mono_runtime = test_data.UseMonoRuntime;
var xammac_arch = test_data.XamMacArch;
var runtime_identifer = test_data.RuntimeIdentifier;
if (task.TestProject.IsDotNetProject)
variation += " [dotnet]";
@ -223,6 +228,8 @@ namespace Xharness.Jenkins {
clone.Xml.SetTopLevelPropertyGroupValue ("UseMonoRuntime", use_mono_runtime.Value ? "true" : "false");
if (!string.IsNullOrEmpty (xammac_arch))
clone.Xml.SetNode ("XamMacArch", xammac_arch, task.ProjectPlatform, configuration);
if (!string.IsNullOrEmpty (runtime_identifer))
clone.Xml.SetNode ("RuntimeIdentifier", runtime_identifer);
clone.Xml.Save (clone.Path);
});