You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by ad...@apache.org on 2018/08/06 22:26:28 UTC
[6/6] kudu git commit: [gradle] Remove integrationTest tasks
[gradle] Remove integrationTest tasks
When initially adding the Gradle build I added separate
source set definitions and tasks for Integration tests to
match the Maven build. However, given that the
gradle retry logic is the same for all tests and there
is no real difference between and integration test and
a unit test, we should remove this to simplify the build.
Change-Id: I58c0bafd19cc21ad9c0f83159fdc47d01e3731bf
Reviewed-on: http://gerrit.cloudera.org:8080/11130
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/f9f16fa5
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/f9f16fa5
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/f9f16fa5
Branch: refs/heads/master
Commit: f9f16fa53525f44167ebd3da469eb7dc804418e1
Parents: 602b451
Author: Grant Henke <gr...@apache.org>
Authored: Mon Aug 6 14:05:37 2018 -0500
Committer: Grant Henke <gr...@apache.org>
Committed: Mon Aug 6 20:24:45 2018 +0000
----------------------------------------------------------------------
build-support/jenkins/build-and-test.sh | 2 +-
java/gradle/quality.gradle | 8 ++---
java/gradle/tests.gradle | 48 ----------------------------
3 files changed, 5 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9f16fa5/build-support/jenkins/build-and-test.sh
----------------------------------------------------------------------
diff --git a/build-support/jenkins/build-and-test.sh b/build-support/jenkins/build-and-test.sh
index 8eb0cdf..6765e46 100755
--- a/build-support/jenkins/build-and-test.sh
+++ b/build-support/jenkins/build-and-test.sh
@@ -403,7 +403,7 @@ if [ "$BUILD_JAVA" == "1" ]; then
EXTRA_GRADLE_FLAGS="$EXTRA_GRADLE_FLAGS -DskipFormat"
EXTRA_GRADLE_FLAGS="$EXTRA_GRADLE_FLAGS $GRADLE_FLAGS"
# TODO: Run `gradle check` in BUILD_TYPE DEBUG when static code analysis is fixed
- if ! ./gradlew $EXTRA_GRADLE_FLAGS clean test integrationTest ; then
+ if ! ./gradlew $EXTRA_GRADLE_FLAGS clean test ; then
EXIT_STATUS=1
FAILURES="$FAILURES"$'Java Gradle build/test failed\n'
fi
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9f16fa5/java/gradle/quality.gradle
----------------------------------------------------------------------
diff --git a/java/gradle/quality.gradle b/java/gradle/quality.gradle
index f88167a..c3d14cf 100644
--- a/java/gradle/quality.gradle
+++ b/java/gradle/quality.gradle
@@ -35,7 +35,7 @@ checkstyle {
// Create an aggregate checkstyle task.
// This simplifies running checkstyle on all the code by only needing one task instead of multiple in your command.
-task checkstyle(dependsOn: [checkstyleMain, checkstyleTest, checkstyleIntegrationTest], group: "Verification") {
+task checkstyle(dependsOn: [checkstyleMain, checkstyleTest], group: "Verification") {
description = "Run Checkstyle analysis."
}
@@ -54,7 +54,7 @@ tasks.withType(com.github.spotbugs.SpotBugsTask) {
// Create an aggregate spotbugs task.
// This simplifies running spotbugs on all the code by only needing one task instead of multiple in your command.
-task spotbugs(dependsOn: [spotbugsMain, spotbugsTest, spotbugsIntegrationTest], group: "Verification") {
+task spotbugs(dependsOn: [spotbugsMain, spotbugsTest], group: "Verification") {
description = "Run SpotBugs analysis."
}
@@ -76,7 +76,7 @@ tasks.withType(ScalaCompile) {
// Create an aggregate pmd task.
// This simplifies running pmd on all the code by only needing one task instead of multiple in your command.
-task pmd(dependsOn: [pmdMain, pmdTest, pmdIntegrationTest], group: "Verification") {
+task pmd(dependsOn: [pmdMain, pmdTest], group: "Verification") {
description = "Run PMD analysis."
}
@@ -110,7 +110,7 @@ dependencies {
// Create an aggregate animal-sniffer task.
// This simplifies running animal-sniffer on all the code by only needing one task instead of multiple in your command.
-task animalsniffer(dependsOn: [animalsnifferMain, animalsnifferTest, animalsnifferIntegrationTest], group: "Verification") {
+task animalsniffer(dependsOn: [animalsnifferMain, animalsnifferTest], group: "Verification") {
description = "Run animal-sniffer analysis."
}
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9f16fa5/java/gradle/tests.gradle
----------------------------------------------------------------------
diff --git a/java/gradle/tests.gradle b/java/gradle/tests.gradle
index 5cb49d8..19f85ee 100644
--- a/java/gradle/tests.gradle
+++ b/java/gradle/tests.gradle
@@ -72,51 +72,3 @@ tasks.withType(Test) {
outputs.upToDateWhen { false }
}
}
-
-// Adds pattern based integration test support.
-// All test files matching the pattern "**/*IT*.java" will be run after the the other tests.
-sourceSets {
- test {
- java {
- exclude "**/*IT*.java"
- }
- }
- integrationTest {
- java {
- srcDirs = ["src/test/java"]
- include "**/*IT*.java"
- }
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- }
-}
-plugins.withType(ScalaPlugin) {
- sourceSets {
- test {
- scala {
- exclude "**/*IT*.scala"
- }
- }
- integrationTest {
- scala {
- srcDirs = ["src/test/scala"]
- include "**/*IT*.scala"
- }
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- }
- }
-}
-
-configurations {
- integrationTestCompile.extendsFrom testCompile
- integrationTestRuntime.extendsFrom testRuntime
-}
-
-task integrationTest(type: Test, group: "Verification") {
- description = "Runs the integration tests."
- testClassesDirs = sourceSets.integrationTest.output.classesDirs
- classpath = sourceSets.integrationTest.runtimeClasspath
- mustRunAfter test
-}
-check.dependsOn(integrationTest)
\ No newline at end of file