From aa34c7d32aedd3edd747a26fb71993efead172c9 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Fri, 1 Sep 2017 11:03:39 +0300
Subject: [PATCH] Fix tests after projects rearrangement

---
 build.gradle.kts                                         | 2 +-
 generators/build.gradle.kts                              | 1 +
 .../tools/kotlin-annotation-processing/build.gradle.kts  | 9 ++-------
 .../source-sections-compiler/build.gradle.kts            | 4 +++-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6388df1aeef..bfaca3ed72b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -279,7 +279,7 @@ tasks {
                   ":kotlin-annotation-processing:test",
                   ":kotlin-source-sections-compiler-plugin:test",
                   ":plugins:uast-kotlin:test",
-                  ":kotlin-annotation-processing")
+                  ":kotlin-annotation-processing-gradle:test")
     }
 
     "scripting-tests" {
diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts
index a4e2e0cb347..34cc6471828 100644
--- a/generators/build.gradle.kts
+++ b/generators/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
     compile(projectTests(":compiler"))
     compile(projectTests(":compiler:tests-java8"))
     compile(projectTests(":compiler:container"))
+    compile(projectTests(":compiler:incremental-compilation-impl"))
     compile(projectTests(":idea"))
     compile(projectTests(":j2k"))
     compile(projectTests(":idea:idea-android"))
diff --git a/libraries/tools/kotlin-annotation-processing/build.gradle.kts b/libraries/tools/kotlin-annotation-processing/build.gradle.kts
index 87baf423ea0..2468616bead 100644
--- a/libraries/tools/kotlin-annotation-processing/build.gradle.kts
+++ b/libraries/tools/kotlin-annotation-processing/build.gradle.kts
@@ -18,18 +18,13 @@ val packedJars by configurations.creating
 
 dependencies {
     compileOnly(project(":kotlin-annotation-processing"))
-    compileOnly("org.jetbrains.kotlin:gradle-api:1.6")
-    compileOnly("com.android.tools.build:gradle:1.1.0")
+    compile("org.jetbrains.kotlin:gradle-api:1.6")
+    compile("com.android.tools.build:gradle:1.1.0")
     compile(projectDist(":kotlin-stdlib"))
     testCompile(commonDep("junit:junit"))
     packedJars(project(":kotlin-annotation-processing")) { isTransitive = false }
 }
 
-sourceSets {
-    "main" { projectDefault() }
-    "test" { projectDefault() }
-}
-
 projectTest {
     workingDir = projectDir
 }
diff --git a/plugins/source-sections/source-sections-compiler/build.gradle.kts b/plugins/source-sections/source-sections-compiler/build.gradle.kts
index 93c2fbe6bc7..631c904cac1 100644
--- a/plugins/source-sections/source-sections-compiler/build.gradle.kts
+++ b/plugins/source-sections/source-sections-compiler/build.gradle.kts
@@ -24,7 +24,9 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-projectTest()
+projectTest {
+    workingDir = rootDir
+}
 
 runtimeJar()
 sourcesJar()