From a223870e7a0844f87b374a5a543f477a68b345bf Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Fri, 1 Dec 2017 18:57:47 +0300
Subject: [PATCH] Exclude JPS tests from normal run. Log Gradle version when
 advancing it.

---
 .../build.gradle                              | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle
index 70062456965..38ed1b5d859 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle
@@ -118,9 +118,25 @@ tasks.withType(Test) {
     }
 }
 
-task testAdvanceGradleVersion(type: Test) {
-    systemProperty("advanceGradleVersion", "4.3-rc-1")
+def jpsIncrementalTestsClass = '**/KotlinGradlePluginJpsParametrizedIT.class'
+
+test {
+    exclude jpsIncrementalTestsClass
+}
+
+task testsFromJps(type: Test) {
+    include jpsIncrementalTestsClass
     dependsOn = test.dependsOn
 }
 
+task testAdvanceGradleVersion(type: Test) {
+    def gradleVersionForTests = "4.3-rc-1"
+    systemProperty("advanceGradleVersion", gradleVersionForTests)
+    dependsOn = test.dependsOn
+    beforeTest { descriptor ->
+        logger.info("(!) Using Gradle version $gradleVersionForTests")
+    }
+    exclude jpsIncrementalTestsClass
+}
+
 check.dependsOn(testAdvanceGradleVersion)
\ No newline at end of file