diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java index 7f983233c29..0010f99a0e4 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java @@ -36,6 +36,8 @@ import java.io.OutputStreamWriter; import java.nio.charset.Charset; import java.util.Collection; +import static org.jetbrains.kotlin.test.MuteWithDatabaseKt.isIgnoredInDatabaseWithLog; + public abstract class KotlinLightCodeInsightFixtureTestCaseBase extends LightCodeInsightFixtureTestCase { @NotNull @Override @@ -57,6 +59,11 @@ public abstract class KotlinLightCodeInsightFixtureTestCaseBase extends LightCod protected final Collection myFilesToDelete = new THashSet<>(); private final TempFiles myTempFiles = new TempFiles(myFilesToDelete); + @Override + protected boolean shouldRunTest() { + return super.shouldRunTest() && !isIgnoredInDatabaseWithLog(this); + } + @Override protected void tearDown() throws Exception { myTempFiles.deleteAll(); diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.191 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.191 index 1751423e63b..496a98bc59a 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.191 +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.191 @@ -37,6 +37,8 @@ import java.io.OutputStreamWriter; import java.nio.charset.Charset; import java.util.Collection; +import static org.jetbrains.kotlin.test.MuteWithDatabaseKt.isIgnoredInDatabaseWithLog; + public abstract class KotlinLightCodeInsightFixtureTestCaseBase extends LightCodeInsightFixtureTestCase { @NotNull @Override @@ -62,6 +64,11 @@ public abstract class KotlinLightCodeInsightFixtureTestCaseBase extends LightCod protected final Collection myFilesToDelete = new THashSet<>(); private final TempFiles myTempFiles = new TempFiles(myFilesToDelete); + @Override + protected boolean shouldRunTest() { + return super.shouldRunTest() && !isIgnoredInDatabaseWithLog(this); + } + @Override protected void tearDown() throws Exception { myTempFiles.deleteAll(); diff --git a/tests/mute.csv b/tests/mute.csv index f48a373c316..ab54bbf467d 100644 --- a/tests/mute.csv +++ b/tests/mute.csv @@ -50,4 +50,5 @@ org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.test org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.testUsingKotlinPackageDeclarations, ERROR: Access to tree elements not allowed. org.jetbrains.kotlin.jps.build.IncrementalJvmJpsTestGenerated.Custom.testBuildError, Since dc8240c24ebd-ab79c3e0a06f0 Function has several compatible actual declarations in modules org.jetbrains.kotlin.jps.build.IncrementalJvmJpsTestGenerated.Custom.testBuildError2Levels, Since dc8240c24ebd-ab79c3e0a06f0 Function has several compatible actual declarations in modules -org.jetbrains.kotlin.jps.build.IncrementalJvmJpsTestGenerated.WithJava.JavaUsedInKotlin.testMixedInheritance, Different clean up \ No newline at end of file +org.jetbrains.kotlin.jps.build.IncrementalJvmJpsTestGenerated.WithJava.JavaUsedInKotlin.testMixedInheritance, Different clean up +org.jetbrains.kotlin.psi.injection.StringInterpolationInjectionTest.testInterpolationSimpleName, Stable failure during run may work in debug \ No newline at end of file diff --git a/tests/mute.csv.191 b/tests/mute.csv.191 index 4a75048dd6e..3415e1706e2 100644 --- a/tests/mute.csv.191 +++ b/tests/mute.csv.191 @@ -33,4 +33,5 @@ org.jetbrains.kotlin.idea.quickfix.QuickFixTestGenerated.Libraries.testJunit, ER org.jetbrains.kotlin.idea.quickfix.QuickFixTestGenerated.Libraries.testTestNG, ERROR: Couldn't find the following libraries org.jetbrains.kotlin.jps.build.IncrementalJvmJpsTestGenerated.Custom.testBuildError, Since dc8240c24ebd-ab79c3e0a06f0 Function has several compatible actual declarations in modules org.jetbrains.kotlin.jps.build.IncrementalJvmJpsTestGenerated.Custom.testBuildError2Levels, Since dc8240c24ebd-ab79c3e0a06f0 Function has several compatible actual declarations in modules -org.jetbrains.kotlin.jps.build.IncrementalJvmJpsTestGenerated.WithJava.JavaUsedInKotlin.testMixedInheritance, Different clean up \ No newline at end of file +org.jetbrains.kotlin.jps.build.IncrementalJvmJpsTestGenerated.WithJava.JavaUsedInKotlin.testMixedInheritance, Different clean up +org.jetbrains.kotlin.psi.injection.StringInterpolationInjectionTest.testInterpolationSimpleName, Stable failure during run may work in debug \ No newline at end of file diff --git a/tests/mute.csv.193 b/tests/mute.csv.193 index 1e39fc21796..371e039e51f 100644 --- a/tests/mute.csv.193 +++ b/tests/mute.csv.193 @@ -169,4 +169,5 @@ org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.test org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.testUsingKotlinPackageDeclarations, ERROR: Access to tree elements not allowed. org.jetbrains.kotlin.jps.build.IncrementalJvmJpsTestGenerated.Custom.testBuildError, Since dc8240c24ebd-ab79c3e0a06f0 Function has several compatible actual declarations in modules org.jetbrains.kotlin.jps.build.IncrementalJvmJpsTestGenerated.Custom.testBuildError2Levels, Since dc8240c24ebd-ab79c3e0a06f0 Function has several compatible actual declarations in modules -org.jetbrains.kotlin.jps.build.IncrementalJvmJpsTestGenerated.WithJava.JavaUsedInKotlin.testMixedInheritance, Different clean up \ No newline at end of file +org.jetbrains.kotlin.jps.build.IncrementalJvmJpsTestGenerated.WithJava.JavaUsedInKotlin.testMixedInheritance, Different clean up +org.jetbrains.kotlin.psi.injection.StringInterpolationInjectionTest.testInterpolationSimpleName, Stable failure during run may work in debug \ No newline at end of file