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

Substitute hardcoded getJdkXXHome with test jdkHome

Browse Source
This commit is contained in:
Mikhael Bogdanov
2021-12-22 11:49:39 +01:00
committed by Space
parent faa2a67180
commit 8324330823
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt
+3 -4
View File
@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.cli.AbstractCliTest
import org.jetbrains.kotlin.cli.AbstractCliTest.getNormalizedCompilerOutput import org.jetbrains.kotlin.cli.AbstractCliTest.getNormalizedCompilerOutput
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import java.io.File import java.io.File
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import java.util.jar.Manifest 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<File>): ModuleRunResult { private fun runModule(className: String, modulePath: List<File>): ModuleRunResult {
val command = listOf( val command = listOf(
File(KtTestUtil.getJdk11Home(), "bin/java").path, File(jdkHome, "bin/java").path,
"-p", (modulePath + ForTestCompileRuntime.runtimeJarForTests()).joinToString(File.pathSeparator, transform = File::getPath), "-p", (modulePath + ForTestCompileRuntime.runtimeJarForTests()).joinToString(File.pathSeparator, transform = File::getPath),
"-m", className "-m", className
) )
@@ -204,7 +203,7 @@ abstract class JavaModulesIntegrationTest(private val jdkVersion: Int, private v
val kotlinOptions = mutableListOf( val kotlinOptions = mutableListOf(
"$testDataDirectory/someOtherDirectoryWithTheActualModuleInfo/module-info.java", "$testDataDirectory/someOtherDirectoryWithTheActualModuleInfo/module-info.java",
"-jdk-home", KtTestUtil.getJdk11Home().path, "-jdk-home", jdkHome.path,
"-Xmodule-path=${a.path}" "-Xmodule-path=${a.path}"
) )
compileLibrary( compileLibrary(
@@ -228,7 +227,7 @@ abstract class JavaModulesIntegrationTest(private val jdkVersion: Int, private v
try { try {
// Use the name other from 'library' to prevent it from being loaded as an automatic module if module-info.class is not found. // 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( 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)) module("main", listOf(libraryJar))
} catch (e: Throwable) { } catch (e: Throwable) {