diff --git a/compiler/integration-tests/data/antTaskJvm/build.log.expected b/compiler/integration-tests/data/antTaskJvm/build.log.expected index 982e7a713f4..98710f8f8c2 100644 --- a/compiler/integration-tests/data/antTaskJvm/build.log.expected +++ b/compiler/integration-tests/data/antTaskJvm/build.log.expected @@ -6,5 +6,5 @@ OUT [kotlinc] LOGGING: For source: [TestData]\hello.kt OUT [kotlinc] LOGGING: Emitting: Hello/namespace.class OUT OUT BUILD SUCCESSFUL -OUT Total time: 2 seconds +OUT Total time: [time] Return code: 0 diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java index b9f11c6fe34..63d5c095d5e 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java @@ -31,6 +31,12 @@ public class AntTaskTest extends KotlinIntegrationTestBase { runJava("hello.run", "-cp", jar, "Hello.namespace"); } + @Override + protected String normalizeOutput(String content) { + return super.normalizeOutput(content) + .replaceAll("Total time: .+\n", "Total time: [time]\n"); + } + private int runAnt(String logName, String scriptName) throws Exception { return runJava(logName, "-jar", getAntHome() + File.separator + "lib" + File.separator + "ant-launcher.jar", "-Dkotlin.lib=" + getCompilerLib(), diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java b/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java index b0ec6652e4b..49874136c71 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java @@ -48,6 +48,6 @@ public class CompilerSmokeTest extends KotlinIntegrationTestBase { public void compilationFailed() throws Exception { final String jar = tempDir.getAbsolutePath() + File.separator + "smoke.jar"; - assertEquals("compilation failed", 0, runCompiler("hello.compile", "-src", "hello.kt", "-jar", jar)); + runCompiler("hello.compile", "-src", "hello.kt", "-jar", jar); } } diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java b/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java index 87111fcb574..0b33c0da0db 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java @@ -113,14 +113,17 @@ public abstract class KotlinIntegrationTestBase { return exitCode; } + protected String normalizeOutput(String content) { + return StringUtil.replace( + StringUtil.replace(content, testDataDir.getAbsolutePath(), "[TestData]", true), + tempDir.getAbsolutePath(), "[Temp]", true); + } + protected void check(String baseName, String content) throws IOException { final File actualFile = new File(testDataDir, baseName + ".actual"); final File expectedFile = new File(testDataDir, baseName + ".expected"); - final String normalizedContent = - StringUtil.replace( - StringUtil.replace(content, testDataDir.getAbsolutePath(), "[TestData]", true), - tempDir.getAbsolutePath(), "[Temp]", true); + final String normalizedContent = normalizeOutput(content); if (!expectedFile.isFile()) { Files.write(normalizedContent, actualFile, Charsets.UTF_8);