From f2ecf7f666ec7e49cb250a0629d3fa335c7d4fb8 Mon Sep 17 00:00:00 2001 From: Yunir Salimzyanov Date: Tue, 22 Dec 2020 16:18:01 +0300 Subject: [PATCH] Mute MultiModuleHighlightingTest via csv-file --- .../src/org/jetbrains/kotlin/test/mutes/MutedTestsSync.kt | 4 ++-- tests/mute-common.csv | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/tests-mutes/tc-integration/src/org/jetbrains/kotlin/test/mutes/MutedTestsSync.kt b/compiler/tests-mutes/tc-integration/src/org/jetbrains/kotlin/test/mutes/MutedTestsSync.kt index 70772272a60..d076aa4d9b8 100644 --- a/compiler/tests-mutes/tc-integration/src/org/jetbrains/kotlin/test/mutes/MutedTestsSync.kt +++ b/compiler/tests-mutes/tc-integration/src/org/jetbrains/kotlin/test/mutes/MutedTestsSync.kt @@ -58,7 +58,7 @@ object Bunches { } private fun readAllRulesFromFile(): List { - val file = File("../..", ".bunch") + val file = File("../../..", ".bunch") if (!file.exists()) { throw BunchException("Can't build list of rules. File '${file.canonicalPath}' doesn't exist") } @@ -93,7 +93,7 @@ class LocallyMutedTests { private fun getMutedTestsFromDatabase(): Map> { val mutedTestsMap = mutableMapOf>() - val databaseDir = "../../tests" + val databaseDir = "../../../tests" val commonDatabaseFile = File(databaseDir, "mute-common.csv") mutedTestsMap[muteCommonTestKey] = flakyTests(commonDatabaseFile) diff --git a/tests/mute-common.csv b/tests/mute-common.csv index b85ef64c32d..66d3525abdf 100644 --- a/tests/mute-common.csv +++ b/tests/mute-common.csv @@ -81,3 +81,4 @@ org.jetbrains.kotlin.idea.caches.resolve.IdeLightClassTestGenerated.CompilationE org.jetbrains.kotlin.idea.caches.resolve.IdeLightClassTestGenerated.CompilationErrors.testJvmPackageName, Invalid behavior of old lightclasses in common tests,, org.jetbrains.uast.test.kotlin.SimpleKotlinRenderLogTest.testReceiverFun, Analysing of facade annotation with receiver site is broken (connected with KT-40403),, org.jetbrains.kotlin.checkers.FirPsiCheckerTestGenerated.Regression.testJet53,,, FLAKY +org.jetbrains.kotlin.idea.caches.resolve.MultiModuleHighlightingTest.testLanguageVersionsViaFacets,,, FLAKY