From a0aba043383c7e515532b68156bd3172b67813ef Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 16 Jun 2015 18:11:19 +0200 Subject: [PATCH] rebase ate my changes --- .../tests/org/jetbrains/kotlin/cli/CliBaseTest.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java index ddf02e79d8a..d5a207cf28d 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.cli; import com.intellij.openapi.util.Pair; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; @@ -77,7 +78,14 @@ public class CliBaseTest { } public static String removePerfOutput(String output) { - return output.replaceAll("INFO: PERF:.+\n", ""); + String[] lines = StringUtil.splitByLinesKeepSeparators(output); + StringBuilder result = new StringBuilder(); + for (String line : lines) { + if (!line.contains("INFO: PERF:")) { + result.append(line); + } + } + return result.toString(); } private void executeCompilerCompareOutput(@NotNull CLICompiler compiler, @NotNull String testDataDir) throws Exception {