Build: move generated-resources to build (#30366)

This commit moves the generated-resources directory to be within the build directory for the openldap-tests and saml-idp-tests projects. Both projects create a generated-resources directory that should have been in the build directory but were instead at the same level as the build directory.
elastic · May 10, 2018 · 023fb15 · 023fb15
1 parent 47db1d6
commit 023fb15
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/x-pack/qa/openldap-tests/build.gradle b/x-pack/qa/openldap-tests/build.gradle
@@ -14,7 +14,7 @@ task openLdapFixture {
     dependsOn "vagrantCheckVersion", "virtualboxCheckVersion", idpFixtureProject.up
 }
 
-String outputDir = "generated-resources/${project.name}"
+String outputDir = "${project.buildDir}/generated-resources/${project.name}"
 task copyIdpTrust(type: Copy) {
     from idpFixtureProject.file('src/main/resources/certs/idptrust.jks');
     into outputDir

diff --git a/x-pack/qa/saml-idp-tests/build.gradle b/x-pack/qa/saml-idp-tests/build.gradle
@@ -16,7 +16,7 @@ task idpFixture {
     dependsOn "vagrantCheckVersion", "virtualboxCheckVersion", idpFixtureProject.up
 }
 
-String outputDir = "generated-resources/${project.name}"
+String outputDir = "${project.buildDir}/generated-resources/${project.name}"
 task copyIdpCertificate(type: Copy) {
     from idpFixtureProject.file('src/main/resources/certs/ca.crt');
     into outputDir