From 9a5555963bcf949c54960e4e2995fc3d1da4db08 Mon Sep 17 00:00:00 2001
From: Alpar Torok <torokalpar@gmail.com>
Date: Mon, 14 May 2018 16:06:56 +0300
Subject: [PATCH] Add missing dependencies on testClasses (#30527)

---
 .../src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy  | 1 +
 modules/repository-url/build.gradle                              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
index 9cc5bb82552..85fe712fd8d 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
@@ -744,6 +744,7 @@ class BuildPlugin implements Plugin<Project> {
             additionalTest.testClassesDir = test.testClassesDir
             additionalTest.configure(commonTestConfig(project))
             additionalTest.configure(config)
+            additionalTest.dependsOn(project.tasks.testClasses)
             test.dependsOn(additionalTest)
         });
         return test
diff --git a/modules/repository-url/build.gradle b/modules/repository-url/build.gradle
index 79fe5e7aaef..62aad486ad8 100644
--- a/modules/repository-url/build.gradle
+++ b/modules/repository-url/build.gradle
@@ -34,6 +34,7 @@ File repositoryDir = new File(project.buildDir, "shared-repository")
 
 /** A task to start the URLFixture which exposes the repositoryDir over HTTP **/
 task urlFixture(type: AntFixture) {
+    dependsOn testClasses
     doFirst {
         repositoryDir.mkdirs()
     }