From 256bd8d5948da354c3065b8a8f16fb64fd572a57 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 5 Jun 2020 23:40:41 +0300 Subject: [PATCH] 202: Disable check for broken plugins in tests Otherwise is is an exception in PluginManagerCore because of brokenPlugins.txt file. --- buildSrc/src/main/kotlin/tasks.kt | 4 ++++ gradle/jps.gradle.kts | 1 + 2 files changed, 5 insertions(+) diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 62bd3d51882..8fc64df6c8a 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -107,6 +107,10 @@ fun Project.projectTest( systemProperty("kotlin.ni", if (rootProject.hasProperty("newInferenceTests")) "true" else "false") systemProperty("org.jetbrains.kotlin.skip.muted.tests", if (rootProject.hasProperty("skipMutedTests")) "true" else "false") + if (Platform[202].orHigher()) { + systemProperty("idea.ignore.disabled.plugins", "true") + } + var subProjectTempRoot: Path? = null doFirst { val teamcity = rootProject.findProperty("teamcity") as? Map diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts index 5bdd9f9483d..936326a8668 100644 --- a/gradle/jps.gradle.kts +++ b/gradle/jps.gradle.kts @@ -27,6 +27,7 @@ fun JUnit.configureForKotlin(xmx: String = "1600m") { "-Djna.nosys=true", if (Platform[201].orHigher()) "-Didea.platform.prefix=Idea" else null, "-Didea.is.unit.test=true", + if (Platform[202].orHigher()) "-Didea.ignore.disabled.plugins=true" else null, "-Didea.home.path=$ideaSdkPath", "-Djps.kotlin.home=${ideaPluginDir.absolutePath}", "-Dkotlin.ni=" + if (rootProject.hasProperty("newInferenceTests")) "true" else "false",