azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tests, sorry

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-06-17 18:18:24 +02:00
parent 1a3209e1dc
commit e852b2d748
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInJava/output.txt
Vendored
+4 -4
View File
@@ -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
compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
+3 -3
View File
@@ -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);