Skip to content

Commit 5672c5b

Browse files
authored
Merge branch 'net11.0' into dev/rolf/bump-main-in-net11.0-2025-12-15
2 parents b6281b3 + 92858cd commit 5672c5b

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

tests/xharness/Jenkins/TestVariationsFactory.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
3838
var x64_sim_runtime_identifier = string.Empty;
3939
var supports_mono = test.Platform != TestPlatform.Mac;
4040
var supports_coreclr = true;
41+
var coreclr_works = Harness.CanRunArm64 || test.Platform == TestPlatform.Mac; // ignore tests on x64 until https://github.com/dotnet/runtime/issues/122563
42+
var ignore_coreclr = coreclr_works ? ignore : true;
4143

4244
switch (test.Platform) {
4345
case TestPlatform.Mac:
@@ -73,13 +75,13 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
7375
break;
7476
case "introspection":
7577
if (supports_coreclr && supports_mono) { // we only need specific coreclr test if we *also* support mono (otherwise the default test will be coreclr)
76-
yield return new TestData { Variation = "CoreCLR", TestVariation = "coreclr", Ignored = ignore };
78+
yield return new TestData { Variation = "CoreCLR", TestVariation = "coreclr", Ignored = ignore_coreclr };
7779
}
7880
break;
7981
case "monotouch-test":
8082
if (supports_coreclr && supports_mono) { // we only need specific coreclr test if we *also* support mono (otherwise the default test will be coreclr)
81-
yield return new TestData { Variation = "Debug (CoreCLR)", TestVariation = "debug|coreclr", Ignored = ignore };
82-
yield return new TestData { Variation = "Release (CoreCLR)", TestVariation = "release|coreclr", Ignored = ignore };
83+
yield return new TestData { Variation = "Debug (CoreCLR)", TestVariation = "debug|coreclr", Ignored = ignore_coreclr };
84+
yield return new TestData { Variation = "Release (CoreCLR)", TestVariation = "release|coreclr", Ignored = ignore_coreclr };
8385
}
8486
break;
8587
}

0 commit comments

Comments
 (0)