Remove intellij-core from testRuntime if full idea is already there

Looks like it makes tests flacky

compiler/build.gradle.kts

@@ -40,7 +40,6 @@ val testJvm6ServerRuntime by configurations.creating
 val antLauncherJar by configurations.creating
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep()) // Should come before compiler, because of "progarded" stuff needed for tests
 
     depDistProjects.forEach {

idea/build.gradle.kts

@@ -74,7 +74,7 @@ dependencies {
     (rootProject.extra["compilerModules"] as Array<String>).forEach {
         testCompile(project(it))
     }
-    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testCompile(intellijPluginDep("IntelliLang"))
     testCompile(intellijPluginDep("copyright"))
     testCompile(intellijPluginDep("properties"))

idea/idea-android/build.gradle.kts

@@ -6,7 +6,6 @@ apply { plugin("kotlin") }
 val androidSdk by configurations.creating
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compileOnly(project(":kotlin-reflect-api"))

idea/idea-gradle/build.gradle.kts

@@ -4,7 +4,6 @@ apply { plugin("kotlin") }
 val androidSdk by configurations.creating
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compileOnly(project(":idea"))

j2k/build.gradle.kts

@@ -2,7 +2,6 @@
 apply { plugin("kotlin") }
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compile(projectDist(":kotlin-stdlib"))

jps-plugin/build.gradle.kts

@@ -28,7 +28,6 @@ dependencies {
         testRuntime(project(it))
     }
     testRuntime(intellijDep())
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(projectDist(":kotlin-reflect"))
 }
 

js/js.tests/build.gradle.kts

@@ -15,7 +15,6 @@ apply { plugin("kotlin") }
 val antLauncherJar by configurations.creating
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     testCompile(protobufFull())

plugins/allopen/allopen-cli/build.gradle.kts

@@ -4,7 +4,6 @@ description = "Kotlin AllOpen Compiler Plugin"
 apply { plugin("kotlin") }
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compileOnly(project(":compiler:plugin-api"))

plugins/android-extensions/android-extensions-idea/build.gradle.kts

@@ -9,7 +9,6 @@ val androidSdk by configurations.creating
 val androidJar by configurations.creating
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compile(project(":compiler:util"))

plugins/android-extensions/android-extensions-jps/build.gradle.kts

@@ -4,7 +4,6 @@ apply { plugin("kotlin") }
 val androidSdk by configurations.creating
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compile(project(":compiler:util"))

plugins/kapt3/kapt3-compiler/build.gradle.kts

@@ -4,7 +4,7 @@ description = "Annotation Processor for Kotlin"
 apply { plugin("kotlin") }
 
 dependencies {
-    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
     testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "openapi") }
 

plugins/noarg/noarg-cli/build.gradle.kts

@@ -4,7 +4,6 @@ description = "Kotlin NoArg Compiler Plugin"
 apply { plugin("kotlin") }
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compileOnly(project(":compiler:frontend"))

plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts

@@ -4,6 +4,8 @@ description = "Kotlin SamWithReceiver Compiler Plugin"
 apply { plugin("kotlin") }
 
 dependencies {
+    testRuntime(intellijDep())
+
     compileOnly(project(":compiler:frontend"))
     compileOnly(project(":compiler:frontend.java"))
     compileOnly(project(":compiler:plugin-api"))
@@ -17,8 +19,7 @@ dependencies {
     testCompile(project(":compiler:tests-common"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
-    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntime(intellijDep())
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
 sourceSets {

ultimate/build.gradle.kts

@@ -18,7 +18,6 @@ val springClasspath by configurations.creating
 
 dependencies {
     if (intellijUltimateEnabled) {
-        testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
         testRuntime(intellijUltimateDep())
     }