From 21d0beb94b6f71330a55e61527707932d8c1ad82 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 25 Apr 2019 15:08:29 +0200 Subject: [PATCH] Do not render stack traces and bytecode on muted failed tests locally This was already disabled on buildserver with a35f368ce0, but makes sense locally too because otherwise IntelliJ renders a lot of output which takes lots of memory and slows down the test runner --- compiler/build.gradle.kts | 1 - .../kotlin/codegen/AbstractBlackBoxCodegenTest.java | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 4df76f43370..4298eeb822c 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -83,7 +83,6 @@ projectTest(parallel = true) { dependsOn(":dist") workingDir = rootDir systemProperty("kotlin.test.script.classpath", testSourceSet.output.classesDirs.joinToString(File.pathSeparator)) - systemProperty("kotlin.suppress.expected.test.failures", project.findProperty("kotlin.suppress.expected.test.failures") ?: false) doFirst { systemProperty("kotlin.ant.classpath", antLauncherJar.asPath) systemProperty("kotlin.ant.launcher.class", "org.apache.tools.ant.Main") diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java index a0740b430da..a2beffc986b 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java @@ -27,13 +27,9 @@ import static org.jetbrains.kotlin.test.clientserver.TestProcessServerKt.getBoxM import static org.jetbrains.kotlin.test.clientserver.TestProcessServerKt.getGeneratedClass; public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { - - private static final boolean IGNORE_EXPECTED_FAILURES = - Boolean.getBoolean("kotlin.suppress.expected.test.failures"); - @Override protected void doMultiFileTest(@NotNull File wholeFile, @NotNull List files) throws Exception { - boolean isIgnored = IGNORE_EXPECTED_FAILURES && InTextDirectivesUtils.isIgnoredTarget(getBackend(), wholeFile); + boolean isIgnored = InTextDirectivesUtils.isIgnoredTarget(getBackend(), wholeFile); compile(files, !isIgnored);