Copy dependency caches for testkit tests

xtext · Nov 14, 2020 · 70b0f51 · 70b0f51
1 parent 45fd1b0
commit 70b0f51
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,6 @@ out/
 # Gradle
 .gradle/
 build/
-
+testkit-dir/
 # Local configuration file (sdk path, etc)
-local.properties
+local.properties
diff --git a/build.gradle b/build.gradle
@@ -73,17 +73,21 @@ configure(subprojects.findAll{p-> p.name.contains('plugin')}){
     }
   }
 
+  tasks.withType(Test) {
+    def testkitDir = System.getenv("CI") ? gradle.gradleUserHomeDir : "$rootDir/testkit-dir"
+    systemProperty 'gradle.project.version', version
+    systemProperty 'org.gradle.testkit.dir', testkitDir
+  }
+
   minimumIntegrationTest {
     dependsOn("install")
-    systemProperty 'gradle.project.version', version
     systemProperty 'xtext.version', minimumXtextVersion
   }
 
   task latestIntegrationTest(type: Test) {
     classpath = minimumIntegrationTest.classpath
     testClassesDirs = minimumIntegrationTest.testClassesDirs
     dependsOn("install")
-    systemProperty 'gradle.project.version', version
     systemProperty 'xtext.version', latestXtextVersion
     enabled = JavaVersion.current().java8Compatible
   }