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

Tests: Do not search for android-extensions-runtime in KOTLIN_PATH

Browse Source
This commit is contained in:
Yan Zhulanow
2017-10-11 23:08:39 +03:00
parent 61d1963ddb
commit eb39c4c590
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/CompilerTestUtils.kt
+2 -20
View File
@@ -62,29 +62,11 @@ fun KtUsefulTestCase.createTestEnvironment(configuration: CompilerConfiguration,
fun addAndroidExtensionsRuntimeLibrary(environment: KotlinCoreEnvironment) { fun addAndroidExtensionsRuntimeLibrary(environment: KotlinCoreEnvironment) {
environment.apply { environment.apply {
val runtimeLibrary = File(computeKotlinPaths().libPath, "android-extensions-compiler.jar") val runtimeLibrary = File(PathUtil.kotlinPathsForCompiler.libPath, "android-extensions-compiler.jar")
updateClasspath(listOf(JvmClasspathRoot(runtimeLibrary))) updateClasspath(listOf(JvmClasspathRoot(runtimeLibrary)))
} }
} }
fun getResPaths(path: String): List<String> { fun getResPaths(path: String): List<String> {
return File(path).listFiles { it -> it.name.startsWith("res") && it.isDirectory }!!.map { "$path${it.name}/" } return File(path).listFiles { it -> it.name.startsWith("res") && it.isDirectory }!!.map { "$path${it.name}/" }
} }
val KOTLIN_HOME_PROPERTY = "kotlin.home"
val KOTLIN_HOME_ENV_VAR = "KOTLIN_HOME"
private fun computeKotlinPaths(): KotlinPaths {
val kotlinHomeProperty = System.getProperty(KOTLIN_HOME_PROPERTY)
val kotlinHomeEnvVar = System.getenv(KOTLIN_HOME_ENV_VAR)
val kotlinHome = when {
kotlinHomeProperty != null -> File(kotlinHomeProperty)
kotlinHomeEnvVar != null -> File(kotlinHomeEnvVar)
else -> null
}
return when {
kotlinHome == null -> PathUtil.kotlinPathsForCompiler
kotlinHome.isDirectory -> KotlinPathsFromHomeDir(kotlinHome)
else -> throw RuntimeException("Kotlin home does not exist or is not a directory: " + kotlinHome)
}
}