You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by cc...@apache.org on 2016/12/04 16:54:41 UTC

[3/3] groovy git commit: Avoid resolution of `testClasspath` dependencies at configuration time

Avoid resolution of `testClasspath` dependencies at configuration time


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/31027cf0
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/31027cf0
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/31027cf0

Branch: refs/heads/master
Commit: 31027cf07b7cbbb36a2deb7fe0b2620becf70e6c
Parents: 5338bfc
Author: Cedric Champeau <cc...@apache.org>
Authored: Sun Dec 4 17:54:13 2016 +0100
Committer: Cedric Champeau <cc...@apache.org>
Committed: Sun Dec 4 17:54:13 2016 +0100

----------------------------------------------------------------------
 subprojects/performance/build.gradle | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/31027cf0/subprojects/performance/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/performance/build.gradle b/subprojects/performance/build.gradle
index e78e824..e8fde5e 100644
--- a/subprojects/performance/build.gradle
+++ b/subprojects/performance/build.gradle
@@ -71,13 +71,6 @@ task performanceTests {
         main = 'org.apache.groovy.perf.CompilerPerformanceTest'
         classpath = groovyConf + sourceSets.test.output + configurations.stats
         jvmArgs = ['-Xms512m', '-Xmx512m', '-XX:MaxPermSize=512m']
-        def compileClassPath = [
-                '-cp',
-                groovyConf.files[0]
-        ]
-        rootProject.sourceSets.test.compileClasspath.files
-                .findAll { it.name.endsWith('jar') && !it.name.contains('groovy') }
-                .collect(compileClassPath) { it.absolutePath }
 
         // configure some files to compile. This is an arbitrary set of files which can be compiled
         // independently of the version of Groovy being tested
@@ -99,10 +92,20 @@ task performanceTests {
             "../../benchmark/bench/${it}.groovy"
         }
 
-        args = [
-                *testFiles,
-                *compileClassPath
-        ]
+        doFirst {
+            def compileClassPath = [
+                    '-cp',
+                    groovyConf.files[0]
+            ]
+            rootProject.sourceSets.test.compileClasspath.files
+                    .findAll { it.name.endsWith('jar') && !it.name.contains('groovy') }
+                    .collect(compileClassPath) { it.absolutePath }
+
+            args = [
+                    *testFiles,
+                    *compileClassPath
+            ]
+        }
 
     }
     performanceTests.dependsOn(t)