performance counters infrastructure

This commit is contained in:
Dmitry Jemerov
2015-06-03 13:17:12 +02:00
parent a3a33ce089
commit a321e8eef5
10 changed files with 304 additions and 122 deletions
@@ -73,7 +73,11 @@ public class CliBaseTest {
.replace("expected ABI version is " + Integer.toString(JvmAbi.VERSION), "expected ABI version is $ABI_VERSION$")
.replace("\\", "/");
return normalizedOutputWithoutExitCode + exitCode;
return removePerfOutput(normalizedOutputWithoutExitCode) + exitCode;
}
public static String removePerfOutput(String output) {
return output.replaceAll("INFO: PERF:.+\n", "");
}
private void executeCompilerCompareOutput(@NotNull CLICompiler<?> compiler, @NotNull String testDataDir) throws Exception {
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.integration;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.cli.CliBaseTest;
import java.io.File;
import java.util.ArrayList;
@@ -38,7 +39,8 @@ public abstract class AntTaskBaseTest extends KotlinIntegrationTestBase {
@Override
protected String normalizeOutput(String content) {
return super.normalizeOutput(content).replaceAll("Total time: .+\n", "Total time: [time]\n");
return CliBaseTest.removePerfOutput(super.normalizeOutput(content))
.replaceAll("Total time: .+\n", "Total time: [time]\n");
}
private int runAnt(String logName, String scriptName, String... extraArgs) throws Exception {