java-performance: produce additional report, instead of replacing exi…

…sting

android-performance/build.gradle

@@ -44,16 +44,7 @@ android {
 }
 
 ext.reportsDir = file("$buildDir/outputs/androidTest-results/connected")
-ext.outputReportFile = file("$buildDir/reports/android-performance-0.tsv")
-if (ext.outputReportFile.exists()) {
-    for (int i = 1; i < 1000; i++) {
-        def f = file("$buildDir/reports/android-performance-${i}.tsv")
-        if (!f.exists()) {
-            ext.outputReportFile = f
-            break;
-        }
-    }
-}
+ext.outputReportFile = reportFile(file("$buildDir/reports"), "android-performance-%index%.tsv")
 
 task generateReport {
     inputs.dir reportsDir

build.gradle

@@ -10,3 +10,13 @@ task wrapper(type: Wrapper) {
     gradleVersion = '2.12'
 }
 
+def reportFile(File parentDir, String templateName) {
+    def file
+    for (int i = 0; i < 1000; i++) {
+        file = new File(parentDir, templateName.replaceAll('%index%', i as String))
+        if (!file.exists()) {
+            return file;
+        }
+    }
+    return file
+}

java-essentials-performance/benchmarks.gradle

@@ -35,7 +35,7 @@ ext.benchmarks = [
     [tests: ['StringHexBenchmark$StdImpl', 'StringHexBenchmark$LibImpl'], runs: 1000, warmUp: 10]
 ]
 
-ext.reportFile = file("$buildDir/reports/performance.tsv")
+ext.reportFile = reportFile(file("$buildDir/reports"), "performance-%index%.tsv")
 
 // using cpu time for measurements instead of wall time can be specified with -DcpuTime
 ext.useWallTime = !project.hasProperty('cpuTime')
@@ -44,7 +44,6 @@ ext.useWallTime = !project.hasProperty('cpuTime')
 task allBenchmarks {
     dependsOn compileJava
     inputs.sourceDir sourceSets.main.java.srcDirs.first()
-    outputs.file reportFile
 
     doFirst {
         reportFile.parentFile.mkdirs()