add support to extend eager test task classpaths

Author: jakelandis

buildSrc/src/main/java/org/elasticsearch/gradle/util/GradleUtils.java

@@ -196,6 +196,19 @@ public static void extendSourceSet(Project project, String parentSourceSetName,
         child.setRuntimeClasspath(project.getObjects().fileCollection().from(child.getRuntimeClasspath(), parent.getOutput()));
     }
 
+    /**
+     * Extends one configuration from another and refreshes the classpath of a provided Test.
+     * The Test parameter is only needed for eagerly defined test tasks.
+     */
+    public static void extendSourceSet(Project project, String parentSourceSetName, String childSourceSetName, Test test) {
+        extendSourceSet(project, parentSourceSetName, childSourceSetName);
+        if (test != null) {
+            SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
+            SourceSet child = sourceSets.getByName(childSourceSetName);
+            test.setClasspath(child.getRuntimeClasspath());
+        }
+    }
+
     public static Dependency projectDependency(Project project, String projectPath, String projectConfig) {
         if (project.findProject(projectPath) == null) {
             throw new GradleException("no project [" + projectPath + "], project names: " + project.getRootProject().getAllprojects());

qa/die-with-dignity/build.gradle

@@ -10,7 +10,7 @@ esplugin {
 }
 
 // let the javaRestTest see the classpath of main
-GradleUtils.extendSourceSet(project, "main", "javaRestTest")
+GradleUtils.extendSourceSet(project, "main", "javaRestTest", javaRestTest)
 
 javaRestTest {
   systemProperty 'tests.security.manager', 'false'

x-pack/plugin/deprecation/qa/rest/build.gradle

@@ -14,7 +14,7 @@ dependencies {
 }
 
 // let the javaRestTest see the classpath of main
-GradleUtils.extendSourceSet(project, "main", "javaRestTest")
+GradleUtils.extendSourceSet(project, "main", "javaRestTest", javaRestTest)
 
 
 restResources {

x-pack/plugin/ilm/qa/multi-node/build.gradle

@@ -7,7 +7,7 @@ dependencies {
 }
 
 // let the javaRestTest see the classpath of main
-GradleUtils.extendSourceSet(project, "main", "javaRestTest")
+GradleUtils.extendSourceSet(project, "main", "javaRestTest", javaRestTest)
 
 
 File repoDir = file("$buildDir/testclusters/repo")