Skip to content

Commit 6376bd1

Browse files
kotlarmilosrolfbjarne
authored andcommitted
EnableCoreCLR tests on x64
1 parent c8ff73e commit 6376bd1

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

tests/xharness/Jenkins/TestVariationsFactory.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ 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
42-
var ignore_coreclr = coreclr_works ? ignore : true;
4341

4442
switch (test.Platform) {
4543
case TestPlatform.Mac:
@@ -75,13 +73,13 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
7573
break;
7674
case "introspection":
7775
if (supports_coreclr && supports_mono) { // we only need specific coreclr test if we *also* support mono (otherwise the default test will be coreclr)
78-
yield return new TestData { Variation = "CoreCLR", TestVariation = "coreclr", Ignored = ignore_coreclr };
76+
yield return new TestData { Variation = "CoreCLR", TestVariation = "coreclr", Ignored = ignore };
7977
}
8078
break;
8179
case "monotouch-test":
8280
if (supports_coreclr && supports_mono) { // we only need specific coreclr test if we *also* support mono (otherwise the default test will be coreclr)
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 };
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 };
8583
}
8684
break;
8785
}

0 commit comments

Comments
 (0)