Fix tests in the new build infrastructure

2017-08-24 17:11:23 +03:00
parent a61facf3d1
commit d039d191f2
48 changed files with 383 additions and 228 deletions
@@ -344,9 +344,9 @@ public class KotlinTestUtils {

    @NotNull
    public static String getHomeDirectory() {
-        File resourceRoot = PathUtil.getResourcePathForClass(KotlinTestUtils.class);
-        // TODO: very fragile logic, consider more robust home dir detection
-        return FileUtil.toSystemIndependentName(resourceRoot.getParentFile().getParentFile().getParentFile().getParent());
+        String userDir = System.getProperty("user.dir");
+        File dir = new File(userDir == null ? "." : userDir);
+        return FileUtil.toCanonicalPath(dir.getAbsolutePath());
    }

    public static File findMockJdkRtJar() {