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

Merge remote-tracking branch 'origin/master' into idea14

Browse Source
This commit is contained in:
Nikolay Krasko
2014-07-01 20:06:09 +04:00
parent cab3161ad7 47f4bbedda
commit b92df2882c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class SpecialFiles {
}
private static void fillExcludedFiles() {
excludedFiles.add("boxWithJava"); // Must compile Java files before
excludedFiles.add("boxAgainstJava"); // Must compile Java files before
excludedFiles.add("boxMultiFile"); // MultiFileTest not supported yet
excludedFiles.add("boxInline"); // MultiFileTest not supported yet
compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
+3 -2
View File
@@ -111,8 +111,9 @@ public abstract class CodegenTestCase extends UsefulTestCase {
@NotNull
protected String relativePath(@NotNull File file) {
String stringToCut = "compiler/testData/codegen/";
assert file.getPath().startsWith(stringToCut) : "File path is not absolute: " + file;
return file.getPath().substring(stringToCut.length());
String systemIndependentPath = file.getPath().replace(File.separatorChar, '/');
assert systemIndependentPath.startsWith(stringToCut) : "File path is not absolute: " + file;
return systemIndependentPath.substring(stringToCut.length());
}
@NotNull