azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CHERRY PICKED FROM IJ] Fix tests with Gradle project importer

Browse Source 
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
This commit is contained in:
Yan Zhulanow
2020-12-10 19:35:23 +09:00
committed by Nikita Bobko
parent 24ab459e3a
commit 24e195d7c1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt
+2 -2
View File
@@ -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() {