From 24e195d7c18ee309ac2ec2d99ff5ceef6f46a759 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 10 Dec 2020 19:35:23 +0900 Subject: [PATCH] [CHERRY PICKED FROM IJ] Fix tests with Gradle project importer Adds explicit 'android.dir' preference to 'local.properties' of a Gradle project so Android components don't get in the way. (cherry picked from commit 3b83f67587bb04810f5de50d6a29ab7963bd24ec) GitOrigin-RevId: 6d7063bb8c5253c828f9df22efdfdaf2910b99c3 Original commit: https://github.com/JetBrains/intellij-community/commit/1e326c986175c2bb14ad6711caafb96ff85def4a --- .../jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1b74d42a80e..4a1e98e1b85 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,7 +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 +import org.jetbrains.kotlin.test.AndroidStudioTestUtils @WithMutedInDatabaseRunTest abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() { @@ -40,7 +40,7 @@ abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() { } override fun shouldRunTest(): Boolean { - return super.shouldRunTest() && !TestPlatform.checkIsAndroidStudio() + return super.shouldRunTest() && !AndroidStudioTestUtils.checkIsAndroidStudio() } override fun tearDown() {