Skip to content

Commit 75643fe

Browse files
committed
Do not generate tests tasks for current Java version
1 parent 510262d commit 75643fe

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

gradle/java.gradle

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ if (project.parent && project.parent.hasProperty("javaExecutableVersionCache"))
152152
project.ext.javaExecutableVersionCache = [:]
153153
}
154154

155-
def getJavaExecutableVersion(String path) {
155+
JavaVersion getJavaExecutableVersion(String path) {
156156
def cache = project.ext.javaExecutableVersionCache
157157

158158
if (cache.containsKey(path)) {
@@ -221,14 +221,25 @@ for (def env : System.getenv().entrySet()) {
221221
def javaPath = "$javaHome/bin/java"
222222
def javaVersion = getJavaExecutableVersion(javaPath)
223223

224+
// This is slightly complicated because we need to dereference symlinks to make sure
225+
// we are considering same JVM implementation
226+
def currentJavaHome = new File(System.getProperty("java.home")).toPath().toRealPath()
227+
if (currentJavaHome.endsWith("jre")) {
228+
currentJavaHome = currentJavaHome.parent
229+
}
230+
if (currentJavaHome == new File(javaHome).toPath().toRealPath()) {
231+
// Skip JVM implementation we are running gradle on
232+
continue
233+
}
234+
224235
def parentTask = task "testJava${javaName}"() {
225236
group = 'Verification'
226237
description = "Run tests for Java ${javaName}"
227238
}
228239
tasks.check.dependsOn parentTask
229240

230241
tasks.withType(Test).configureEach {
231-
// if (name.endsWith("Generated")) {
242+
//if (name.endsWith("Generated")) {
232243
if (!name.equals("test")) {
233244
// The way we're copying the test doesn't currently work with "test-sets" generated tests.
234245
return

0 commit comments

Comments
 (0)