From 3a7c6749570f31e42eec8f55ed7d8a471c90702d Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Wed, 27 Jun 2018 23:47:14 +0300
Subject: [PATCH] Fix test dependencies in jps-plugin

Otherwise tests fail on clean checkout
---
 jps-plugin/build.gradle.kts      | 7 +++----
 jps-plugin/build.gradle.kts.173  | 7 +++----
 jps-plugin/build.gradle.kts.as31 | 7 +++----
 jps-plugin/build.gradle.kts.as32 | 7 +++----
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts
index 19f2822366e..0a980219458 100644
--- a/jps-plugin/build.gradle.kts
+++ b/jps-plugin/build.gradle.kts
@@ -35,19 +35,18 @@ dependencies {
     }
     testRuntime(intellijDep())
     testRuntime(projectDist(":kotlin-reflect"))
+    testRuntime(projectDist(":kotlin-compiler"))
+    testRuntime(projectDist(":kotlin-script-runtime"))
 }
 
 sourceSets {
     "main" { projectDefault() }
     "test" {
-        java.srcDirs("jps-tests/test"
-                     /*, "kannotator-jps-plugin-test/test"*/ // Obsolete
-        )
+        java.srcDirs("jps-tests/test")
     }
 }
 
 projectTest {
-    dependsOn(":kotlin-compiler:dist")
     workingDir = rootDir
 }
 
diff --git a/jps-plugin/build.gradle.kts.173 b/jps-plugin/build.gradle.kts.173
index abd1359101f..24a8a334bdf 100644
--- a/jps-plugin/build.gradle.kts.173
+++ b/jps-plugin/build.gradle.kts.173
@@ -35,19 +35,18 @@ dependencies {
     }
     testRuntime(intellijDep())
     testRuntime(projectDist(":kotlin-reflect"))
+    testRuntime(projectDist(":kotlin-compiler"))
+    testRuntime(projectDist(":kotlin-script-runtime"))
 }
 
 sourceSets {
     "main" { projectDefault() }
     "test" {
-        java.srcDirs("jps-tests/test"
-                     /*, "kannotator-jps-plugin-test/test"*/ // Obsolete
-        )
+        java.srcDirs("jps-tests/test")
     }
 }
 
 projectTest {
-    dependsOn(":kotlin-compiler:dist")
     workingDir = rootDir
 }
 
diff --git a/jps-plugin/build.gradle.kts.as31 b/jps-plugin/build.gradle.kts.as31
index 6ef316dfb62..2914aca5fe3 100644
--- a/jps-plugin/build.gradle.kts.as31
+++ b/jps-plugin/build.gradle.kts.as31
@@ -34,19 +34,18 @@ dependencies {
     }
     testRuntime(intellijDep())
     testRuntime(projectDist(":kotlin-reflect"))
+    testRuntime(projectDist(":kotlin-compiler"))
+    testRuntime(projectDist(":kotlin-script-runtime"))
 }
 
 sourceSets {
     "main" { projectDefault() }
     "test" {
-        /*java.srcDirs("jps-tests/test"
-                     /*, "kannotator-jps-plugin-test/test"*/ // Obsolete
-        )*/
+        java.srcDirs("jps-tests/test")
     }
 }
 
 projectTest {
-    dependsOn(":kotlin-compiler:dist")
     workingDir = rootDir
 }
 
diff --git a/jps-plugin/build.gradle.kts.as32 b/jps-plugin/build.gradle.kts.as32
index 314de763987..68aa91d909e 100644
--- a/jps-plugin/build.gradle.kts.as32
+++ b/jps-plugin/build.gradle.kts.as32
@@ -34,19 +34,18 @@ dependencies {
     }
     testRuntime(intellijDep())
     testRuntime(projectDist(":kotlin-reflect"))
+    testRuntime(projectDist(":kotlin-compiler"))
+    testRuntime(projectDist(":kotlin-script-runtime"))
 }
 
 sourceSets {
     "main" { projectDefault() }
     "test" {
-        /*java.srcDirs("jps-tests/test"
-                     /*, "kannotator-jps-plugin-test/test"*/ // Obsolete
-        )*/
+        java.srcDirs("jps-tests/test")
     }
 }
 
 projectTest {
-    dependsOn(":kotlin-compiler:dist")
     workingDir = rootDir
 }