@@ -34,10 +34,6 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
3434 @TempDir
3535 Path testKitFolder
3636
37- def setupSpec () {
38- givenGradleProperties()
39- }
40-
4137 @IgnoreIf (reason = " Jacoco plugin does not work with OpenJ9 in older Gradle versions" , value = {
4238 JavaVirtualMachine .isJ9()
4339 })
@@ -79,6 +75,7 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
7975 def " test junit4 class ordering v#gradleVersion" () {
8076 givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion)
8177 givenGradleProjectFiles(projectName)
78+ givenGradleProjectProperties()
8279 ensureDependenciesDownloaded(gradleVersion)
8380
8481 mockBackend. givenKnownTests(true )
@@ -124,6 +121,7 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
124121 givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion)
125122 givenConfigurationCacheIsCompatibleWithCurrentPlatform(configurationCache)
126123 givenGradleProjectFiles(projectName)
124+ givenGradleProjectProperties()
127125 ensureDependenciesDownloaded(gradleVersion)
128126
129127 mockBackend. givenFlakyRetries(flakyRetries)
@@ -150,7 +148,7 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
150148 }
151149 }
152150
153- private void givenGradleProperties () {
151+ private void givenGradleProjectProperties () {
154152 assert new File (AGENT_JAR ). isFile()
155153
156154 def ddApiKeyPath = testKitFolder. resolve(" .dd.api.key" )
@@ -173,7 +171,9 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
173171 def arguments = buildJvmArguments(mockBackend. intakeUrl, TEST_SERVICE_NAME , additionalArgs)
174172
175173 def gradleProperties = " org.gradle.jvmargs=${ arguments.join(" ")} " . toString()
176- Files . write(testKitFolder. resolve(" gradle.properties" ), gradleProperties. getBytes())
174+ // Write to projectFolder (per-test) instead of testKitFolder (shared), so each
175+ // Gradle daemon gets its own unique preference directory
176+ Files . write(projectFolder. resolve(" gradle.properties" ), gradleProperties. getBytes())
177177 }
178178
179179 private BuildResult runGradleTests (String gradleVersion , boolean successExpected = true , boolean configurationCache = false ) {
0 commit comments