From 3acb96e47429c28f8823edfbb5a4f34868136d20 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 9 Aug 2021 11:47:02 +0200 Subject: [PATCH] Allow running KotlinJavaToolchainTest on any user JDK. --- .../org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt index 909f5b5e02e..e06822807be 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt @@ -682,7 +682,7 @@ class KotlinJavaToolchainTest : KGPBaseTest() { ) { useToolchainExtension(8) - build("assemble", forceOutput = true) + build("assemble") } } @@ -690,7 +690,7 @@ class KotlinJavaToolchainTest : KGPBaseTest() { javaexecPath: String ) = 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 getJdk11(): JavaInfo = Jvm.forHome(File(System.getProperty("jdk11Home"))) // replace required for windows paths so Groovy will not complain about unexpected char '\'