diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInJava/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInJava/output.txt index c21fc022e1e..8b8aad8876e 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInJava/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInJava/output.txt @@ -1,7 +1,7 @@ -compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInJava/source.kt:5:22: error: unresolved reference: foo -fun bar() = SubSub().foo() - ^ error: the following classes have incomplete hierarchies: test.Sub, unresolved: [Super] -COMPILATION_ERROR +compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInJava/source.kt:5:22: error: unresolved reference: foo +fun bar() = SubSub().foo() + ^ +COMPILATION_ERROR \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java index 816190f33e8..4766c779fa4 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java @@ -108,15 +108,15 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir { handler.waitFor(); int exitCode = handler.getProcess().exitValue(); - appendIfNotEmpty(executionLog, "OUT:\n", outContent); - appendIfNotEmpty(executionLog, "\nERR:\n", errContent); + appendIfNotEmpty(executionLog, "OUT:\n", outContent.toString()); + appendIfNotEmpty(executionLog, "\nERR:\n", CliBaseTest.removePerfOutput(errContent.toString())); executionLog.append("\nReturn code: ").append(exitCode).append("\n"); return exitCode; } - private static void appendIfNotEmpty(StringBuilder executionLog, String prefix, StringBuilder content) { + private static void appendIfNotEmpty(StringBuilder executionLog, String prefix, String content) { if (content.length() > 0) { executionLog.append(prefix); executionLog.append(content);