diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt index dbb288bfd4d..1b74d42a80e 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt @@ -30,6 +30,7 @@ import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest import org.jetbrains.kotlin.test.runTest import org.jetbrains.kotlin.idea.test.runAll +import org.jetbrains.kotlin.test.TestPlatform @WithMutedInDatabaseRunTest abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() { @@ -38,6 +39,10 @@ abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() { System.setProperty("kotlin.jps.tests", "true") } + override fun shouldRunTest(): Boolean { + return super.shouldRunTest() && !TestPlatform.checkIsAndroidStudio() + } + override fun tearDown() { runAll( ThrowableRunnable {