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

Use KotlinPaths to access jars

Browse Source
This commit is contained in:
Ilya Chernikov
2019-02-10 12:54:42 +01:00
parent 66107d430e
commit dab97ac936
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
+8 -3
View File
@@ -34,6 +34,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.config.KotlinCompilerVersion;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TestCaseWithTmpdir;
import org.jetbrains.kotlin.utils.KotlinPaths;
import org.jetbrains.kotlin.utils.PathUtil;
import java.io.File;
@@ -134,9 +135,13 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir {
}
public static File getCompilerLib() {
File file = PathUtil.getKotlinPathsForDistDirectory().getLibPath().getAbsoluteFile();
assertTrue("Lib directory doesn't exist. Run 'ant dist'", file.isDirectory());
return file;
return getKotlinPaths().getLibPath().getAbsoluteFile();
}
public static KotlinPaths getKotlinPaths() {
KotlinPaths paths = PathUtil.getKotlinPathsForDistDirectory();
assertTrue("Compiler dist not found. Build 'dist' target.", paths.getLibPath().isDirectory());
return paths;
}
private static class OutputListener extends ProcessAdapter {