From 8e83e1c17aeac7b854af89b70a8b20af3c5ced53 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 15 Sep 2015 19:57:40 +0300 Subject: [PATCH] Fix testIncompleteHierarchyInKotlin on Windows --- .../incompleteHierarchyInKotlin/output.txt | 1 + .../jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInKotlin/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInKotlin/output.txt index 8b1cbe7d19c..846181f0b97 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInKotlin/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInKotlin/output.txt @@ -4,3 +4,4 @@ error: supertypes of the following classes cannot be resolved. Please make sure compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInKotlin/source.kt:5:22: error: unresolved reference: foo fun bar() = SubSub().foo() ^ +COMPILATION_ERROR diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index c72c1f82149..1ed4c15df6c 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -256,8 +256,9 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { "-classpath", library.getPath(), "-d", tmpdir.getPath() )); + String output = CliBaseTest.getNormalizedCompilerOutput(pair.first, pair.second, getTestDataDirectory().getPath()); - JetTestUtils.assertEqualsToFile(new File(getTestDataDirectory(), "output.txt"), pair.first); + JetTestUtils.assertEqualsToFile(new File(getTestDataDirectory(), "output.txt"), output); } /*test source mapping generation when source info is absent*/