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

Allow running KotlinJavaToolchainTest on any user JDK.

Browse Source
This commit is contained in:
Yahor Berdnikau
2021-08-09 11:47:02 +02:00
parent c57302abba
commit 3acb96e474
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt
+2 -2
View File
@@ -682,7 +682,7 @@ class KotlinJavaToolchainTest : KGPBaseTest() {
) { ) {
useToolchainExtension(8) useToolchainExtension(8)
build("assemble", forceOutput = true) build("assemble")
} }
} }
@@ -690,7 +690,7 @@ class KotlinJavaToolchainTest : KGPBaseTest() {
javaexecPath: String javaexecPath: String
) = assertOutputContains("[KOTLIN] Kotlin compilation 'jdkHome' argument: $javaexecPath") ) = assertOutputContains("[KOTLIN] Kotlin compilation 'jdkHome' argument: $javaexecPath")
private fun getUserJdk(): JavaInfo = Jvm.forHome(File(System.getenv("JAVA_HOME"))) private fun getUserJdk(): JavaInfo = Jvm.forHome(File(System.getProperty("java.home")))
private fun getJdk9(): JavaInfo = Jvm.forHome(File(System.getProperty("jdk9Home"))) private fun getJdk9(): JavaInfo = Jvm.forHome(File(System.getProperty("jdk9Home")))
private fun getJdk11(): JavaInfo = Jvm.forHome(File(System.getProperty("jdk11Home"))) private fun getJdk11(): JavaInfo = Jvm.forHome(File(System.getProperty("jdk11Home")))
// replace required for windows paths so Groovy will not complain about unexpected char '\' // replace required for windows paths so Groovy will not complain about unexpected char '\'