diff --git a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java index f445806758f..4056960242a 100644 --- a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java +++ b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java @@ -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 diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java index 6114fd05da0..94217cb3e67 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java @@ -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