Merge pull request #24108 Cherry-pick 23909 to release

As requested by @bot-gradle Co-authored-by: bot-gradle <bot-gradle@gradle.com>
gradle · Mar 2, 2023 · 79929bc · 79929bc
2 parents 1852525 + 836f843
commit 79929bc
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/...egTest/groovy/org/gradle/launcher/continuous/MultiProjectContinuousIntegrationTest.groovy b/...egTest/groovy/org/gradle/launcher/continuous/MultiProjectContinuousIntegrationTest.groovy
@@ -19,6 +19,9 @@ package org.gradle.launcher.continuous
 import org.gradle.integtests.fixtures.AbstractContinuousIntegrationTest
 import spock.lang.Ignore
 
+import static org.gradle.util.TestPrecondition.MAC_OS_X
+import static org.gradle.util.TestPrecondition.NOT_MAC_OS_X_M1
+
 class MultiProjectContinuousIntegrationTest extends AbstractContinuousIntegrationTest {
 
     def upstreamSource, downstreamSource
@@ -41,6 +44,14 @@ class MultiProjectContinuousIntegrationTest extends AbstractContinuousIntegratio
 
         upstreamSource = file("upstream/src/main/java/Upstream.java") << "class Upstream {}"
         downstreamSource = file("downstream/src/main/java/Downstream.java").createFile() << "class Downstream extends Upstream {}"
+
+        // MacOS builds with Intel machines can be too fast on CI and
+        // changes generated during build are picked up only after the build which retriggers the build
+        // Fix for issue: https://github.com/gradle/gradle-private/issues/3728
+        if (MAC_OS_X.fulfilled && NOT_MAC_OS_X_M1.fulfilled) {
+            def quietPeriod = 250
+            waitAtEndOfBuildForQuietPeriod(quietPeriod)
+        }
     }
 
     def "changes to upstream project triggers build of downstream"() {