From 83243308233995157ce46ac4d1472ac6d5cd0881 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Wed, 22 Dec 2021 11:49:39 +0100 Subject: [PATCH] Substitute hardcoded getJdkXXHome with test jdkHome --- .../kotlin/jvm/compiler/JavaModulesIntegrationTest.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt index 7c3f4a8d478..fa1b4a6e303 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.cli.AbstractCliTest import org.jetbrains.kotlin.cli.AbstractCliTest.getNormalizedCompilerOutput import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.test.KotlinTestUtils -import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import java.util.concurrent.TimeUnit import java.util.jar.Manifest @@ -76,7 +75,7 @@ abstract class JavaModulesIntegrationTest(private val jdkVersion: Int, private v private fun runModule(className: String, modulePath: List): ModuleRunResult { val command = listOf( - File(KtTestUtil.getJdk11Home(), "bin/java").path, + File(jdkHome, "bin/java").path, "-p", (modulePath + ForTestCompileRuntime.runtimeJarForTests()).joinToString(File.pathSeparator, transform = File::getPath), "-m", className ) @@ -204,7 +203,7 @@ abstract class JavaModulesIntegrationTest(private val jdkVersion: Int, private v val kotlinOptions = mutableListOf( "$testDataDirectory/someOtherDirectoryWithTheActualModuleInfo/module-info.java", - "-jdk-home", KtTestUtil.getJdk11Home().path, + "-jdk-home", jdkHome.path, "-Xmodule-path=${a.path}" ) compileLibrary( @@ -228,7 +227,7 @@ abstract class JavaModulesIntegrationTest(private val jdkVersion: Int, private v try { // Use the name other from 'library' to prevent it from being loaded as an automatic module if module-info.class is not found. val libraryJar = createMultiReleaseJar( - KtTestUtil.getJdk11Home(), File(tmpdir, "multi-release-library-jdk$version.jar"), libraryOut, version, libraryOut11 + jdkHome, File(tmpdir, "multi-release-library-jdk$version.jar"), libraryOut, version, libraryOut11 ) module("main", listOf(libraryJar)) } catch (e: Throwable) {