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

Fix testIncompleteHierarchyInKotlin on Windows

Browse Source
This commit is contained in:
Alexander Udalov
2015-09-15 19:57:40 +03:00
parent 6f902823d5
commit 8e83e1c17a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInKotlin/output.txt
Vendored
+1
View File
@@ -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 compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInKotlin/source.kt:5:22: error: unresolved reference: foo
fun bar() = SubSub().foo() fun bar() = SubSub().foo()
^ ^
COMPILATION_ERROR
compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java
+2 -1
View File
@@ -256,8 +256,9 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
"-classpath", library.getPath(), "-classpath", library.getPath(),
"-d", tmpdir.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*/ /*test source mapping generation when source info is absent*/