diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java index 0b8ecccc452..60c309898fb 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java @@ -16,13 +16,12 @@ package org.jetbrains.kotlin.cli; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; -import kotlin.text.Charsets; import kotlin.Pair; import kotlin.io.FilesKt; +import kotlin.text.Charsets; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cli.common.CLICompiler; import org.jetbrains.kotlin.cli.common.ExitCode; @@ -89,18 +88,7 @@ public class CliBaseTest { .replace("\\", "/") .replace(KotlinVersion.VERSION, "$VERSION$"); - return removePerfOutput(normalizedOutputWithoutExitCode) + exitCode; - } - - public static String removePerfOutput(String output) { - String[] lines = StringUtil.splitByLinesKeepSeparators(output); - StringBuilder result = new StringBuilder(); - for (String line : lines) { - if (!line.contains("PERF:")) { - result.append(line); - } - } - return result.toString(); + return normalizedOutputWithoutExitCode + exitCode; } private void executeCompilerCompareOutput(@NotNull CLICompiler compiler, @NotNull String testDataDir) throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt index 09cd3776369..326c976cef3 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt @@ -16,11 +16,10 @@ package org.jetbrains.kotlin.daemon -import org.jetbrains.kotlin.cli.CliBaseTest -import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase import org.jetbrains.kotlin.daemon.client.DaemonReportingTargets import org.jetbrains.kotlin.daemon.client.KotlinCompilerClient import org.jetbrains.kotlin.daemon.common.* +import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.ByteArrayOutputStream import java.io.File @@ -56,7 +55,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() { assertEquals("first compilation failed:\n${res1.out}", 0, res1.resultCode) val res2 = compileOnDaemon(clientAliveFile, compilerId, daemonJVMOptions, daemonOptions, *args) assertEquals("second compilation failed:\n${res2.out}", 0, res2.resultCode) - assertEquals("build results differ", CliBaseTest.removePerfOutput(res1.out), CliBaseTest.removePerfOutput(res2.out)) + assertEquals("build results differ", res1.out, res2.out) } private fun getTestBaseDir(): String = KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/" + getTestName(true) diff --git a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java index 0f06e2a817a..81229cd8ead 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java @@ -30,7 +30,6 @@ import kotlin.text.Regex; import org.intellij.lang.annotations.Language; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.cli.CliBaseTest; import org.jetbrains.kotlin.cli.common.KotlinVersion; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestCaseWithTmpdir; @@ -85,7 +84,6 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir { content = normalizePath(content, getKotlinProjectHome(), "[KotlinProjectHome]"); content = content.replaceAll(Pattern.quote(KotlinVersion.VERSION), "[KotlinVersion]"); content = StringUtil.convertLineSeparators(content); - content = CliBaseTest.removePerfOutput(content); return content; } @@ -110,7 +108,7 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir { int exitCode = handler.getProcess().exitValue(); appendIfNotEmpty(executionLog, "OUT:\n", outContent.toString()); - appendIfNotEmpty(executionLog, "\nERR:\n", CliBaseTest.removePerfOutput(errContent.toString())); + appendIfNotEmpty(executionLog, "\nERR:\n", errContent.toString()); executionLog.append("\nReturn code: ").append(exitCode).append("\n");