David Turner 2017-11-24 08:13:13 +00:00 committed by GitHub
parent 4d24748170
commit 933c22dce6
3 changed files with 4 additions and 9 deletions

View File

@ -2,7 +2,6 @@ import org.elasticsearch.gradle.BuildPlugin
import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.Version
import org.elasticsearch.gradle.VersionProperties import org.elasticsearch.gradle.VersionProperties
import org.elasticsearch.gradle.precommit.LicenseHeadersTask import org.elasticsearch.gradle.precommit.LicenseHeadersTask
import sun.reflect.generics.reflectiveObjects.NotImplementedException
if (project.projectDir.name != 'x-pack-elasticsearch') { if (project.projectDir.name != 'x-pack-elasticsearch') {
throw new GradleException('You must checkout x-pack-elasticsearch in the following directory: <path to Elasticsearch checkout>/../elasticsearch-extra/x-pack-elasticsearch') throw new GradleException('You must checkout x-pack-elasticsearch in the following directory: <path to Elasticsearch checkout>/../elasticsearch-extra/x-pack-elasticsearch')

View File

@ -227,10 +227,8 @@ subprojects {
// basic integ tests includes testing bwc against the most recent version // basic integ tests includes testing bwc against the most recent version
task integTest { task integTest {
if (project.bwc_tests_enabled) { if (project.bwc_tests_enabled) {
if (project.bwc_tests_enabled) { for (final def version : versionCollection.basicIntegrationTestVersions) {
for (final def version : versionCollection.basicIntegrationTestVersions) { dependsOn "v${version}#bwcTest"
dependsOn "v${version}#bwcTest"
}
} }
} }
} }

View File

@ -256,10 +256,8 @@ subprojects {
// basic integ tests includes testing bwc against the most recent version // basic integ tests includes testing bwc against the most recent version
task integTest { task integTest {
if (project.bwc_tests_enabled) { if (project.bwc_tests_enabled) {
if (project.bwc_tests_enabled) { for (final def version : versionCollection.basicIntegrationTestVersions) {
for (final def version : versionCollection.basicIntegrationTestVersions) { dependsOn "v${version}#bwcTest"
dependsOn "v${version}#bwcTest"
}
} }
} }
} }