From 24ab459e3a9bad6bcae5ee0c45f4f849f6529110 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 9 Dec 2020 21:59:31 +0900 Subject: [PATCH] [CHERRY PICKED FROM IJ] Disable JPS tests when run against Android Studio (cherry picked from commit 23113fd13f02cac9163a54b0183572e826510366) GitOrigin-RevId: 259f5ca81c749b71cc81d6c690bb73fe3af0e538 Original commit: https://github.com/JetBrains/intellij-community/commit/aa709349738e2814bf725b294e6c7dca68efd3e7 --- .../jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt | 5 +++++ 1 file changed, 5 insertions(+) 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 {