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

[CHERRY PICKED FROM IJ] Disable JPS tests when run against Android Studio

Browse Source 
(cherry picked from commit 23113fd13f02cac9163a54b0183572e826510366)

GitOrigin-RevId: 259f5ca81c749b71cc81d6c690bb73fe3af0e538
Original commit: https://github.com/JetBrains/intellij-community/commit/aa709349738e2814bf725b294e6c7dca68efd3e7
This commit is contained in:
Yan Zhulanow
2020-12-09 21:59:31 +09:00
committed by Nikita Bobko
parent ef27b134a2
commit 24ab459e3a
1 changed files with 5 additions and 0 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
+5
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner
import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest
import org.jetbrains.kotlin.test.runTest import org.jetbrains.kotlin.test.runTest
import org.jetbrains.kotlin.idea.test.runAll import org.jetbrains.kotlin.idea.test.runAll
import org.jetbrains.kotlin.test.TestPlatform
@WithMutedInDatabaseRunTest @WithMutedInDatabaseRunTest
abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() { abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() {
@@ -38,6 +39,10 @@ abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() {
System.setProperty("kotlin.jps.tests", "true") System.setProperty("kotlin.jps.tests", "true")
} }
override fun shouldRunTest(): Boolean {
return super.shouldRunTest() && !TestPlatform.checkIsAndroidStudio()
}
override fun tearDown() { override fun tearDown() {
runAll( runAll(
ThrowableRunnable { ThrowableRunnable {