Move compiler/tests-common/{src -> tests}, adjust dependencies

build-common/build.gradle.kts

@@ -11,11 +11,14 @@ dependencies {
     compileOnly(project(":js:js.serializer"))
     compileOnly(project(":js:js.frontend"))
     compileOnly(ideaSdkDeps("util"))
+    testCompileOnly(project(":compiler:cli-common"))
+    testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
-    testCompile(project(":compiler:tests-common"))
     testCompile(protobufFull())
-    testRuntime(projectDist(":kotlin-stdlib"))
-    testRuntime(projectDist(":kotlin-reflect"))
+    testCompile(projectDist(":kotlin-stdlib"))
+    testCompile(projectDist(":kotlin-reflect"))
+    testCompileOnly(ideaSdkDeps("openapi"))
+    testRuntime(projectDist(":kotlin-compiler"))
 }
 
 sourceSets {

compiler/android-tests/build.gradle.kts

@@ -6,18 +6,19 @@ jvmTarget = "1.6"
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:cli"))
-    compile(project(":compiler:tests-common"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:backend"))
+    compile(projectTests(":compiler:tests-common"))
+    compile(commonDep("junit:junit"))
+    compile(ideaSdkDeps("openapi"))
 
     testCompile(project(":compiler:incremental-compilation-impl"))
     testCompile(project(":core"))
     testCompile(project(":compiler:frontend.java"))
     testCompile(projectTests(":jps-plugin"))
-    testCompile(commonDep("junit:junit"))
     testCompile(ideaSdkDeps("jps-model.jar", subdir = "jps"))
     testCompile(ideaSdkDeps("groovy-all"))
-    testCompile(ideaSdkDeps("openapi", "idea"))
+    testCompile(ideaSdkDeps("idea", "idea_rt"))
     testCompile(ideaSdkDeps("jps-build-test", subdir = "jps/test"))
     testCompile(ideaSdkDeps("jps-builders"))
 }

compiler/build.gradle.kts

@@ -29,7 +29,6 @@ val testDistProjects = listOf(
         ":kotlin-test:kotlin-test-jvm",
         ":kotlin-test:kotlin-test-junit",
         ":kotlin-test:kotlin-test-js",
-        ":kotlin-daemon-client",
         ":kotlin-preloader",
         ":plugins:android-extensions-compiler",
         ":kotlin-ant",
@@ -43,13 +42,18 @@ dependencies {
     testCompile(commonDep("junit:junit"))
     testCompileOnly(projectDist(":kotlin-test:kotlin-test-jvm"))
     testCompileOnly(projectDist(":kotlin-test:kotlin-test-junit"))
-    testCompile(project(":compiler:tests-common"))
+    testCompile(projectTests(":compiler:tests-common"))
     testCompile(project(":compiler:tests-common-jvm6"))
     testCompile(project(":compiler:ir.ir2cfg"))
     testCompile(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward
+    testCompileOnly(project(":kotlin-daemon-client"))
     otherCompilerModules.forEach {
         testCompileOnly(project(it))
     }
+
+    testRuntime(projectDist(":kotlin-compiler"))
+    testRuntime(projectDist(":kotlin-daemon-client"))
+    testRuntime(preloadedDeps("dx", subdir = "android-5.0/lib"))
     testCompile(ideaSdkDeps("openapi", "idea", "util", "asm-all", "commons-httpclient-3.1-patched"))
     testRuntime(ideaSdkCoreDeps("*.jar"))
     testRuntime(ideaSdkDeps("*.jar"))

compiler/incremental-compilation-impl/build.gradle.kts

@@ -11,10 +11,10 @@ dependencies {
     compile(project(":compiler:cli"))
     compile(project(":kotlin-build-common"))
     testCompile(commonDep("junit:junit"))
-    testCompile(project(":compiler:tests-common"))
     testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
     testCompile(projectDist(":kotlin-stdlib"))
     testCompile(projectTests(":kotlin-build-common"))
+    testCompile(projectTests(":compiler:tests-common"))
 }
 
 sourceSets {

compiler/tests-common/build.gradle.kts

@@ -2,33 +2,34 @@
 apply { plugin("kotlin") }
 
 dependencies {
-    compile(project(":core"))
-    compile(project(":core::util.runtime"))
-    compile(project(":compiler:util"))
-    compile(project(":compiler:backend"))
-    compile(project(":compiler:frontend"))
-    compile(project(":compiler:frontend.java"))
-    compile(project(":compiler:util"))
-    compile(project(":compiler:cli-common"))
-    compile(project(":compiler:cli"))
-    compile(project(":compiler:light-classes"))
-    compile(project(":compiler:serialization"))
-    compile(project(":kotlin-preloader"))
-    compile(project(":compiler:daemon-common"))
-    compile(project(":kotlin-daemon-client"))
-    compile(project(":js:js.serializer"))
-    compile(project(":js:js.frontend"))
-    compile(project(":js:js.translator"))
-    compileOnly(project(":plugins:android-extensions-compiler"))
-    compile(project(":kotlin-test:kotlin-test-jvm"))
-    compile(project(":compiler:tests-common-jvm6"))
-    compile(commonDep("junit:junit"))
-    compile(ideaSdkCoreDeps("intellij-core"))
-    compile(ideaSdkDeps("openapi", "idea", "idea_rt"))
-    compile(preloadedDeps("dx", subdir = "android-5.0/lib"))
+    testCompile(project(":core"))
+    testCompile(project(":core::util.runtime"))
+    testCompile(project(":compiler:util"))
+    testCompile(project(":compiler:backend"))
+    testCompile(project(":compiler:frontend"))
+    testCompile(project(":compiler:frontend.java"))
+    testCompile(project(":compiler:util"))
+    testCompile(project(":compiler:cli-common"))
+    testCompile(project(":compiler:cli"))
+    testCompile(project(":compiler:light-classes"))
+    testCompile(project(":compiler:serialization"))
+    testCompile(project(":kotlin-preloader"))
+    testCompile(project(":compiler:daemon-common"))
+    testCompile(project(":js:js.serializer"))
+    testCompile(project(":js:js.frontend"))
+    testCompile(project(":js:js.translator"))
+    testCompileOnly(project(":plugins:android-extensions-compiler"))
+    testCompile(project(":kotlin-test:kotlin-test-jvm"))
+    testCompile(project(":compiler:tests-common-jvm6"))
+    testCompile(commonDep("junit:junit"))
+    testCompile(ideaSdkCoreDeps("intellij-core"))
+    testCompile(ideaSdkDeps("openapi", "idea", "idea_rt"))
+    testCompile(preloadedDeps("dx", subdir = "android-5.0/lib"))
 }
 
 sourceSets {
-    "main" { projectDefault() }
-    "test" { }
+    "main" { }
+    "test" { projectDefault() }
 }
+
+testsJar {}

compiler/tests-java8/build.gradle.kts

@@ -6,7 +6,6 @@ dependencies {
     testCompile(commonDep("junit:junit"))
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
-    testCompile(project(":compiler:tests-common"))
     testCompile(project(":core"))
     testCompile(project(":compiler:util"))
     testCompile(project(":compiler:backend"))
@@ -20,7 +19,9 @@ dependencies {
     testCompile(projectDist(":kotlin-script-runtime"))
     testCompile(projectDist(":kotlin-reflect"))
     testCompile(projectTests(":compiler"))
+    testCompile(projectTests(":compiler:tests-common"))
     testRuntime(projectRuntimeJar(":kotlin-preloader"))
+    testRuntime(preloadedDeps("dx", subdir = "android-5.0/lib"))
     testRuntime(ideaSdkCoreDeps("*.jar"))
     testRuntime(ideaSdkDeps("*.jar"))
 }