Fix ECJ test by constraining Java versions

gradle · Feb 27, 2023 · 277e222 · 277e222
1 parent 74bdc8a
commit 277e222
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/.../integTest/groovy/org/gradle/api/tasks/compile/JavaCompileToolchainIntegrationTest.groovy b/.../integTest/groovy/org/gradle/api/tasks/compile/JavaCompileToolchainIntegrationTest.groovy
@@ -470,10 +470,12 @@ class JavaCompileToolchainIntegrationTest extends AbstractIntegrationSpec implem
     }
 
     @Issue("https://github.com/gradle/gradle/issues/23990")
-    @Requires(TestPrecondition.JDK11_OR_LATER)
     def "can compile with a custom compiler executable"() {
-        def jdk = AvailableJavaHomes.getJdk(JavaVersion.current())
-        def otherJdk = AvailableJavaHomes.differentVersion
+        def otherJdk = AvailableJavaHomes.getJdk(JavaVersion.current())
+        def jdk = AvailableJavaHomes.getDifferentVersion {
+            def v = it.languageVersion.majorVersion.toInteger()
+            11 <= v && v <= 18 // Java versions supported by ECJ releases used in the test
+        }
 
         buildFile << """
             plugins {