[geode] branch develop updated: GEODE-5488: Fixes bad merge that remove distributeTest.

[jbarrett]

This is an automated email from the ASF dual-hosted git repository.

jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new b1890b2  GEODE-5488: Fixes bad merge that remove distributeTest.
b1890b2 is described below

commit b1890b28dc9195fac1d5aa2f4b7acf52a0e669fb
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Fri Jul 27 17:06:22 2018 -0700

    GEODE-5488: Fixes bad merge that remove distributeTest.
---
 gradle/test.gradle | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/gradle/test.gradle b/gradle/test.gradle
index 6dd96f7..3fd2ea5 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -134,7 +134,7 @@ subprojects {
     outputs.upToDateWhen{false}
   }
 
-  performanceTest {
+  distributedTest {
     useJUnit {
       if(project.hasProperty("testCategory")) {
         includeCategories += project.testCategory
@@ -143,11 +143,18 @@ subprojects {
     }
 
     forkEvery 1
+    outputs.upToDateWhen{false}
+  }
 
-    doFirst {
-      TestPropertiesWriter.writeTestProperties(buildDir, name)
+  performanceTest {
+    useJUnit {
+      if(project.hasProperty("testCategory")) {
+        includeCategories += project.testCategory
+      }
+      excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
     }
-    outputs.upToDateWhen{false}
+
+    forkEvery 1
   }
 
   acceptanceTest {
@@ -182,11 +189,6 @@ subprojects {
     outputs.upToDateWhen{false}
   }
 
-  upgradeTest {
-    forkEvery 1
-    outputs.upToDateWhen{false}
-  }
-
 
   task repeatTest(type:RepeatTest) {
     times= Integer.parseInt(repeat)