Skip to content

Require GraalVM as vendor for JDK used in GraalVmStarterTests #4743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 9, 2025
Merged

Require GraalVM as vendor for JDK used in GraalVmStarterTests #4743

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import com.gradle.develocity.agent.gradle.internal.test.TestDistributionConfigur
import junitbuild.extensions.capitalized
import junitbuild.extensions.dependencyProject
import org.gradle.api.tasks.PathSensitivity.RELATIVE
import org.gradle.jvm.toolchain.JvmVendorSpec.GRAAL_VM
import org.gradle.kotlin.dsl.support.listFilesOrdered
import java.time.Duration

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

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

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

@Internal
val javaLauncher: Property<JavaLauncher> = project.objects.property<JavaLauncher>()
.value(project.provider {
try {
project.javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(version)
nativeImageCapable = nativeImage
if (graalvm) {
vendor = GRAAL_VM
nativeImageCapable = true
}
}.get()
} catch (e: Exception) {
null
Expand All @@ -278,7 +282,7 @@ class JavaHomeDir(project: Project, @Input val version: Int, testDistributionEna
}
val metadata = javaLauncher.map { it.metadata }
val javaHome = metadata.map { it.installationPath.asFile.absolutePath }.orNull
return javaHome?.let { listOf("-Djava.home.$version${if (nativeImage) ".nativeImage" else ""}=$it") } ?: emptyList()
return javaHome?.let { listOf("-Djava.home.$version${if (graalvm) ".nativeImage" else ""}=$it") } ?: emptyList()
}
}

Expand Down