Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions tests/xharness/Jenkins/TestVariationsFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
var x64_sim_runtime_identifier = string.Empty;
var supports_mono = test.Platform != TestPlatform.Mac;
var supports_coreclr = true;
var coreclr_works = Harness.CanRunArm64 || test.Platform == TestPlatform.Mac; // ignore tests on x64 until https://github.com/dotnet/runtime/issues/121631
var ignore_coreclr = coreclr_works ? ignore : true;

switch (test.Platform) {
case TestPlatform.Mac:
Expand Down Expand Up @@ -75,13 +73,13 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
break;
case "introspection":
if (supports_coreclr && supports_mono) { // we only need specific coreclr test if we *also* support mono (otherwise the default test will be coreclr)
yield return new TestData { Variation = "CoreCLR", TestVariation = "coreclr", Ignored = ignore_coreclr };
yield return new TestData { Variation = "CoreCLR", TestVariation = "coreclr", Ignored = ignore };
}
break;
case "monotouch-test":
if (supports_coreclr && supports_mono) { // we only need specific coreclr test if we *also* support mono (otherwise the default test will be coreclr)
yield return new TestData { Variation = "Debug (CoreCLR)", TestVariation = "debug|coreclr", Ignored = ignore_coreclr };
yield return new TestData { Variation = "Release (CoreCLR)", TestVariation = "release|coreclr", Ignored = ignore_coreclr };
yield return new TestData { Variation = "Debug (CoreCLR)", TestVariation = "debug|coreclr", Ignored = ignore };
yield return new TestData { Variation = "Release (CoreCLR)", TestVariation = "release|coreclr", Ignored = ignore };
}
break;
}
Expand Down