[geode-benchmarks] branch develop updated: Gradle improvements

[heybales]

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

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


The following commit(s) were added to refs/heads/develop by this push:
     new 04e1ce7  Gradle improvements
04e1ce7 is described below

commit 04e1ce7dd7136308e9574b3e44c11abe12002fd4
Author: Helena A. Bales <hba...@pivotal.io>
AuthorDate: Mon Dec 10 12:02:10 2018 -0800

    Gradle improvements
    
    * benchmark task is never up-to-date, always reruns
    * analyzeRun arguments should be relative to the project root directory
    * use gradle source distribution
    
    Signed-off-by: Dan Smith <dsm...@pivotal.io>
---
 geode-benchmarks/build.gradle            | 11 ++++++-----
 gradle/wrapper/gradle-wrapper.properties |  3 ++-
 harness/build.gradle                     |  1 +
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/geode-benchmarks/build.gradle b/geode-benchmarks/build.gradle
index 492f971..a804675 100644
--- a/geode-benchmarks/build.gradle
+++ b/geode-benchmarks/build.gradle
@@ -24,6 +24,8 @@ version '1.0-SNAPSHOT'
 
 sourceCompatibility = 1.8
 
+def outputDir = project.hasProperty('outputDir') ? 
project.findProperty('outputDir') : new File(project.buildDir, 
"benchmarks").getAbsolutePath()
+
 repositories {
     mavenCentral()
 }
@@ -36,6 +38,7 @@ dependencies {
 }
 
 task benchmark(type: Test) {
+    outputs.upToDateWhen { false }
     testClassesDirs = project.sourceSets.main.output.classesDirs
     classpath = project.sourceSets.main.runtimeClasspath
 
@@ -45,14 +48,12 @@ task benchmark(type: Test) {
 
     forkEvery 1
 
-    def outputDir = project.hasProperty('outputDir') ? 
project.findProperty('outputDir') : new File(project.buildDir, 
"benchmarks").getAbsolutePath();
-
-    systemProperty 'TEST_HOSTS', project.findProperty('hosts');
-    systemProperty 'OUTPUT_DIR', outputDir;
+    systemProperty 'TEST_HOSTS', project.findProperty('hosts')
+    systemProperty 'OUTPUT_DIR', outputDir
 
     doFirst {
         if(!project.hasProperty('hosts')) {
-            throw new IllegalStateException("You must set the hosts property 
to a comma separated list of hosts. Eg ./gradlew benchmark 
-Phosts=localhost,localhost,localhost")
+            throw new GradleException("You must set the hosts property to a 
comma separated list of hosts. Eg ./gradlew benchmark 
-Phosts=localhost,localhost,localhost")
         }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index fb7ef98..8d8c83b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Dec 10 10:58:37 PST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
diff --git a/harness/build.gradle b/harness/build.gradle
index b435237..362ac59 100644
--- a/harness/build.gradle
+++ b/harness/build.gradle
@@ -30,6 +30,7 @@ repositories {
 
 task(analyzeRun, dependsOn: 'classes', type: JavaExec) {
     main = 'org.apache.geode.perftest.analysis.Analyzer'
+    workingDir = rootDir
     classpath = sourceSets.main.runtimeClasspath
 }