Use doFirst to delay setting testOnlyPath env var

prdoyle · prdoyle · commit b2bbf941eb3d · 2025-06-18T15:18:54.000-04:00
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java
@@ -182,7 +182,7 @@ public void execute(Task t) {
                 FileCollection mainRuntime = mainSourceSet.getRuntimeClasspath();
                 FileCollection testRuntime = testSourceSet.getRuntimeClasspath();
                 FileCollection testOnlyFiles = testRuntime.minus(mainRuntime);
-                test.environment("es.entitlement.testOnlyPath", project.provider(testOnlyFiles::getAsPath));
+                test.doFirst(task -> test.environment("es.entitlement.testOnlyPath", testOnlyFiles.getAsPath()));
             }
 
             test.systemProperties(getProviderFactory().systemPropertiesPrefixedBy("tests.").get());

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public void execute(Task t) {`
`182`	`182`	`FileCollection mainRuntime = mainSourceSet.getRuntimeClasspath();`
`183`	`183`	`FileCollection testRuntime = testSourceSet.getRuntimeClasspath();`
`184`	`184`	`FileCollection testOnlyFiles = testRuntime.minus(mainRuntime);`
`185`		`- test.environment("es.entitlement.testOnlyPath", project.provider(testOnlyFiles::getAsPath));`
	`185`	`+ test.doFirst(task -> test.environment("es.entitlement.testOnlyPath", testOnlyFiles.getAsPath()));`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`test.systemProperties(getProviderFactory().systemPropertiesPrefixedBy("tests.").get());`