diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java11ModulesIntegrationTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt similarity index 98% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java11ModulesIntegrationTest.kt rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt index 747e5db64e5..c198a60e604 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java11ModulesIntegrationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt @@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit import java.util.jar.Manifest import kotlin.test.fail -class Java11ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() { +abstract class JavaModulesIntegrationTest(private val jdkHome: File) : AbstractKotlinCompilerIntegrationTest() { override val testDataPath: String get() = "compiler/testData/javaModules/" @@ -32,7 +32,7 @@ class Java11ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() { val paths = (modulePath + ForTestCompileRuntime.runtimeJarForTests()).joinToString(separator = File.pathSeparator) { it.path } val kotlinOptions = mutableListOf( - "-jdk-home", KtTestUtil.getJdk11Home().path, + "-jdk-home", jdkHome.path, "-Xmodule-path=$paths" ) if (addModules.isNotEmpty()) {