Skip to content

Allow testJvm property to receive paths #9332

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
Aug 7, 2025
Merged

Allow testJvm property to receive paths #9332

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
28 changes: 18 additions & 10 deletions gradle/java_no_deps.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import org.gradle.api.internal.provider.PropertyFactory
import org.gradle.jvm.toolchain.internal.SpecificInstallationToolchainSpec

import java.nio.file.Files
import java.nio.file.Paths

apply plugin: 'java-library'

apply from: "$rootDir/gradle/codenarc.gradle"
Expand Down Expand Up @@ -164,17 +167,22 @@ project.afterEvaluate {
testJvm = javaVersions.max().toString()
}
if (testJvm) {
def matcher = testJvm =~ /([a-zA-Z]*)([0-9]+)/
if (!matcher.matches()) {
throw new GradleException("Unable to find launcher for Java '$testJvm'. It needs to match '([a-zA-Z]*)([0-9]+)'.")
}
def testJvmLanguageVersion = matcher.group(2) as Integer
def testJvmEnv = "JAVA_${testJvm}_HOME"
def testJvmHome = System.getenv(testJvmEnv)
if (!testJvmHome) {
throw new GradleException("Unable to find launcher for Java '$testJvm'. Have you set '$testJvmEnv'?")
def testJvmHomePath
if (Files.exists(Paths.get(testJvm))) {
testJvmHomePath = getJavaHomePath(testJvm)
} else {
def matcher = testJvm =~ /([a-zA-Z]*)([0-9]+)/
if (!matcher.matches()) {
throw new GradleException("Unable to find launcher for Java '$testJvm'. It needs to match '([a-zA-Z]*)([0-9]+)'.")
}
def testJvmLanguageVersion = matcher.group(2) as Integer
def testJvmEnv = "JAVA_${testJvm}_HOME"
def testJvmHome = System.getenv(testJvmEnv)
if (!testJvmHome) {
throw new GradleException("Unable to find launcher for Java '$testJvm'. Have you set '$testJvmEnv'?")
}
testJvmHomePath = getJavaHomePath(testJvmHome)
}
def testJvmHomePath = getJavaHomePath(testJvmHome)
// Only change test JVM if it's not the one we are running the gradle build with
if (currentJavaHomePath != testJvmHomePath) {
def jvmSpec = new SpecificInstallationToolchainSpec(project.services.get(PropertyFactory), file(testJvmHomePath))
Expand Down