add isRuntimeJavaHomeSet flag

rjernst · rjernst · commit 29ec29879f04 · 2019-03-01T09:02:17.000-08:00
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
@@ -144,9 +144,11 @@ class BuildPlugin implements Plugin<Project> {
                 compilerJavaVersionEnum = JavaVersion.toVersion(findJavaSpecificationVersion(project, compilerJavaHome))
             }
 
+            boolean isRuntimeJavaHomeSet = false
             String runtimeJavaVersionDetails = gradleJavaVersionDetails
             JavaVersion runtimeJavaVersionEnum = JavaVersion.current()
             if (new File(runtimeJavaHome).canonicalPath != gradleJavaHome.canonicalPath) {
+                isRuntimeJavaHomeSet = true
                 runtimeJavaVersionDetails = findJavaVersionDetails(project, runtimeJavaHome)
                 runtimeJavaVersionEnum = JavaVersion.toVersion(findJavaSpecificationVersion(project, runtimeJavaHome))
             }
@@ -215,6 +217,7 @@ class BuildPlugin implements Plugin<Project> {
             project.rootProject.ext.runtimeJavaVersion = runtimeJavaVersionEnum
             project.rootProject.ext.javaVersions = javaVersions
             project.rootProject.ext.buildChecksDone = true
+            project.rootProject.ext.isRuntimeJavaHomeSet = isRuntimeJavaHomeSet
             project.rootProject.ext.minimumCompilerVersion = minimumCompilerVersion
             project.rootProject.ext.minimumRuntimeVersion = minimumRuntimeVersion
             project.rootProject.ext.inFipsJvm = inFipsJvm
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
@@ -668,11 +668,11 @@ class ClusterFormationTasks {
     static Task configureExecTask(String name, Project project, Task setup, NodeInfo node, Object[] execArgs) {
         return project.tasks.create(name: name, type: LoggedExec, dependsOn: setup) { Exec exec ->
             exec.workingDir node.cwd
-            if (project.runtimeJavaHome.equals(project.compilerJavaHome)) {
+            if (project.isRuntimeJavaHomeSet) {
+                exec.environment.put('JAVA_HOME', project.runtimeJavaHome)
+            } else {
                 // force JAVA_HOME to *not* be set
                 exec.environment.remove('JAVA_HOME')
-            } else {
-                exec.environment.put('JAVA_HOME', project.runtimeJavaHome)
             }
             if (Os.isFamily(Os.FAMILY_WINDOWS)) {
                 exec.executable 'cmd'
@@ -693,7 +693,7 @@ class ClusterFormationTasks {
             ant.exec(executable: node.executable, spawn: node.config.daemonize, newenvironment: true,
                      dir: node.cwd, taskname: 'elasticsearch') {
                 node.env.each { key, value -> env(key: key, value: value) }
-                if (project.runtimeJavaHome.equals(project.compilerJavaHome) == false) {
+                if (project.isRuntimeJavaHomeSet) {
                     env(key: 'JAVA_HOME', value: project.runtimeJavaHome)
                 }
                 node.args.each { arg(value: it) }
