Skip to content

Commit 40b296f

Browse files
authored
Require GraalVM as vendor for JDK used in GraalVmStarterTests (#4743)
1 parent f045ef6 commit 40b296f

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import com.gradle.develocity.agent.gradle.internal.test.TestDistributionConfigur
22
import junitbuild.extensions.capitalized
33
import junitbuild.extensions.dependencyProject
44
import org.gradle.api.tasks.PathSensitivity.RELATIVE
5+
import org.gradle.jvm.toolchain.JvmVendorSpec.GRAAL_VM
56
import org.gradle.kotlin.dsl.support.listFilesOrdered
67
import java.time.Duration
78

@@ -227,7 +228,7 @@ val test by testing.suites.getting(JvmTestSuite::class) {
227228

228229
val gradleJavaVersion = 21
229230
jvmArgumentProviders += JavaHomeDir(project, gradleJavaVersion, develocity.testDistribution.enabled)
230-
jvmArgumentProviders += JavaHomeDir(project, gradleJavaVersion, develocity.testDistribution.enabled, nativeImage = true)
231+
jvmArgumentProviders += JavaHomeDir(project, gradleJavaVersion, develocity.testDistribution.enabled, graalvm = true)
231232
systemProperty("gradle.java.version", gradleJavaVersion)
232233
}
233234
}
@@ -254,15 +255,18 @@ class MavenRepo(project: Project, @get:Internal val repoDir: Provider<File>) : C
254255
override fun asArguments() = listOf("-Dmaven.repo=${repoDir.get().absolutePath}")
255256
}
256257

257-
class JavaHomeDir(project: Project, @Input val version: Int, testDistributionEnabled: Provider<Boolean>, @Input val nativeImage: Boolean = false) : CommandLineArgumentProvider {
258+
class JavaHomeDir(project: Project, @Input val version: Int, testDistributionEnabled: Provider<Boolean>, @Input val graalvm: Boolean = false) : CommandLineArgumentProvider {
258259

259260
@Internal
260261
val javaLauncher: Property<JavaLauncher> = project.objects.property<JavaLauncher>()
261262
.value(project.provider {
262263
try {
263264
project.javaToolchains.launcherFor {
264265
languageVersion = JavaLanguageVersion.of(version)
265-
nativeImageCapable = nativeImage
266+
if (graalvm) {
267+
vendor = GRAAL_VM
268+
nativeImageCapable = true
269+
}
266270
}.get()
267271
} catch (e: Exception) {
268272
null
@@ -278,7 +282,7 @@ class JavaHomeDir(project: Project, @Input val version: Int, testDistributionEna
278282
}
279283
val metadata = javaLauncher.map { it.metadata }
280284
val javaHome = metadata.map { it.installationPath.asFile.absolutePath }.orNull
281-
return javaHome?.let { listOf("-Djava.home.$version${if (nativeImage) ".nativeImage" else ""}=$it") } ?: emptyList()
285+
return javaHome?.let { listOf("-Djava.home.$version${if (graalvm) ".nativeImage" else ""}=$it") } ?: emptyList()
282286
}
283287
}
284288

0 commit comments

Comments
 (0)