Skip to content

Commit 02eeb24

Browse files
committed
[tests] Ignore CoreCLR tests when CoreCLR doesn't work (on x64 at the moment).
1 parent d290546 commit 02eeb24

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tests/xharness/Jenkins/TestVariationsFactory.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ 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/121631
4142

4243
switch (test.Platform) {
4344
case TestPlatform.Mac:
@@ -73,13 +74,13 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
7374
break;
7475
case "introspection":
7576
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 };
77+
yield return new TestData { Variation = "CoreCLR", TestVariation = "coreclr", Ignored = ignore || !coreclr_works };
7778
}
7879
break;
7980
case "monotouch-test":
8081
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 };
82+
yield return new TestData { Variation = "Debug (CoreCLR)", TestVariation = "debug|coreclr", Ignored = ignore || !coreclr_works };
83+
yield return new TestData { Variation = "Release (CoreCLR)", TestVariation = "release|coreclr", Ignored = ignore || !coreclr_works };
8384
}
8485
break;
8586
}

0 commit comments

Comments
 (0)