geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jensde...@apache.org
Subject geode git commit: Define acceptanceTest task for all submodules
Date Tue, 29 Aug 2017 19:44:07 GMT
Repository: geode
Updated Branches:
  refs/heads/develop 4ac5e65f7 -> 4ac4600a1


Define acceptanceTest task for all submodules

- This allows combineReports to be finalizedBy acceptanceTest (thus
  html report is generated correctly).

Signed-off-by: Dick Cavender <dcavender@pivotal.io>


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/4ac4600a
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/4ac4600a
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/4ac4600a

Branch: refs/heads/develop
Commit: 4ac4600a1482a9b84acf6127c355da6a85b8afd0
Parents: 4ac5e65
Author: Jens Deppe <jdeppe@pivotal.io>
Authored: Tue Aug 29 12:40:20 2017 -0700
Committer: Dick Cavender <dcavender@pivotal.io>
Committed: Tue Aug 29 12:40:20 2017 -0700

----------------------------------------------------------------------
 geode-assembly/build.gradle |  8 --------
 gradle/test.gradle          | 11 +++++++++--
 2 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/4ac4600a/geode-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index e135675..1f0c12a 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -106,14 +106,6 @@ sourceSets {
   //test.runtimeClasspath -= configurations.provided
 }
 
-task acceptanceTest(type:Test) {
-  useJUnit {
-    includeCategories 'org.apache.geode.test.junit.categories.AcceptanceTest'
-  }
-  forkEvery 1
-}
-
-
 test {
   // test from the actual classpath not the gradle classpath
   dependsOn installDist

http://git-wip-us.apache.org/repos/asf/geode/blob/4ac4600a/gradle/test.gradle
----------------------------------------------------------------------
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 1b92a52..d321f28 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -220,6 +220,13 @@ subprojects {
     forkEvery 30
   }
 
+  task acceptanceTest(type:Test) {
+    useJUnit {
+      includeCategories 'org.apache.geode.test.junit.categories.AcceptanceTest'
+    }
+    forkEvery 1
+  }
+
   // apply common test configuration
   gradle.taskGraph.whenReady( { graph ->
     tasks.withType(Test).each { test ->
@@ -281,6 +288,6 @@ subprojects {
 
   check.dependsOn checkMissedTests
 
-  combineReports.mustRunAfter check, test, ":geode-assembly:acceptanceTest", integrationTest,
distributedTest, flakyTest, checkMissedTests
-  [build, check, test, integrationTest, distributedTest, flakyTest, checkMissedTests].each
{it.finalizedBy combineReports}
+  combineReports.mustRunAfter check, test, integrationTest, distributedTest, flakyTest, checkMissedTests,
acceptanceTest
+  [build, check, test, integrationTest, distributedTest, flakyTest, checkMissedTests, acceptanceTest].each
{it.finalizedBy combineReports}
 }


Mime
View raw message