Merge pull request gradle#26260 Re-ignore failing native test on macOS

When migrating from `@IgnoreIf`s to `@Requires`, the annotation on `AbstractNativeSoftwareModelParallelIntegrationTest` overwrites the one on super class. Co-authored-by: Bo Zhang <[email protected]>
MainOliver22 · Sep 2, 2023 · b734d19 · b734d19
2 parents 7827a61 + 2eb3186
commit b734d19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/subprojects/internal-testing/src/main/resources/valid-precondition-combinations.csv b/subprojects/internal-testing/src/main/resources/valid-precondition-combinations.csv
@@ -123,4 +123,4 @@ IntegTestPreconditions$JavaHomeWithDifferentVersionAvailable,IntegTestPreconditi
 IntegTestPreconditions$NotParallelExecutor, IntegTestPreconditions$MoreThanOneJavacAvailable
 IntegTestPreconditions$DifferentJdkAvailable,IntegTestPreconditions$NotNoDaemonExecutor,IntegTestPreconditions$NotConfigCached
 IntegTestPreconditions$Groovy3OrEarlier
-
+UnitTestPreconditions$NotMacOs,IntegTestPreconditions$NotParallelExecutor
diff --git a/...Test/groovy/org/gradle/language/AbstractNativeSoftwareModelParallelIntegrationTest.groovy b/...Test/groovy/org/gradle/language/AbstractNativeSoftwareModelParallelIntegrationTest.groovy
@@ -20,9 +20,10 @@ import org.gradle.integtests.fixtures.ToBeFixedForConfigurationCache
 import org.gradle.nativeplatform.fixtures.app.HelloWorldApp
 import org.gradle.test.precondition.Requires
 import org.gradle.test.preconditions.IntegTestPreconditions
+import org.gradle.test.preconditions.UnitTestPreconditions
 
-@Requires(IntegTestPreconditions.NotParallelExecutor)
-// no point, always runs in parallel
+@Requires(value = [IntegTestPreconditions.NotParallelExecutor, UnitTestPreconditions.NotMacOs],
+    reason = "always runs in parallel, our mac currently lacks proper toolchain installations")
 abstract class AbstractNativeSoftwareModelParallelIntegrationTest extends AbstractNativeParallelIntegrationTest {
     abstract HelloWorldApp getApp()