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.config.KotlinCompilerVersion;
import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.test.TestCaseWithTmpdir;
import org.jetbrains.kotlin.utils.KotlinPaths;
import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.utils.PathUtil;
import java.io.File; import java.io.File;
@@ -134,9 +135,13 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir {
} }
public static File getCompilerLib() { public static File getCompilerLib() {
File file = PathUtil.getKotlinPathsForDistDirectory().getLibPath().getAbsoluteFile(); return getKotlinPaths().getLibPath().getAbsoluteFile();
assertTrue("Lib directory doesn't exist. Run 'ant dist'", file.isDirectory()); }
return file;
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 { private static class OutputListener extends ProcessAdapter {
compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
+6 -9
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.daemon.common.*
import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase
import org.jetbrains.kotlin.progress.CompilationCanceledStatus import org.jetbrains.kotlin.progress.CompilationCanceledStatus
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.utils.KotlinPaths
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.io.File import java.io.File
import java.io.PrintStream import java.io.PrintStream
@@ -50,20 +51,16 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
data class CompilerResults(val resultCode: Int, val out: String) data class CompilerResults(val resultCode: Int, val out: String)
val compilerClassPath = listOf( val compilerClassPath = getKotlinPaths().classPath(KotlinPaths.ClassPaths.Compiler)
File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar")
) val compilerWithScriptingClassPath = getKotlinPaths().classPath(KotlinPaths.ClassPaths.CompilerWithScripting)
val scriptingCompilerClassPath = listOf(
File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-scripting-compiler.jar"),
File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-scripting-common.jar"),
File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-scripting-jvm.jar")
)
val daemonClientClassPath = listOf( File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-daemon-client.jar"), val daemonClientClassPath = listOf( File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-daemon-client.jar"),
File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar")) File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar"))
val compilerId by lazy(LazyThreadSafetyMode.NONE) { CompilerId.makeCompilerId(compilerClassPath) } val compilerId by lazy(LazyThreadSafetyMode.NONE) { CompilerId.makeCompilerId(compilerClassPath) }
val compilerWithScriptingId by lazy(LazyThreadSafetyMode.NONE) { val compilerWithScriptingId by lazy(LazyThreadSafetyMode.NONE) {
CompilerId.makeCompilerId(compilerClassPath + scriptingCompilerClassPath) CompilerId.makeCompilerId(compilerWithScriptingClassPath)
} }
private fun compileOnDaemon(clientAliveFile: File, compilerId: CompilerId, daemonJVMOptions: DaemonJVMOptions, daemonOptions: DaemonOptions, vararg args: String): CompilerResults { private fun compileOnDaemon(clientAliveFile: File, compilerId: CompilerId, daemonJVMOptions: DaemonJVMOptions, daemonOptions: DaemonOptions, vararg args: String): CompilerResults {