From 7fc5132ea6ba2780b91c752845b50e7f49cccc27 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Fri, 14 Jun 2019 16:22:05 -0400 Subject: [PATCH] Add support for forcing JDK to run tests on --- gradle/java.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gradle/java.gradle b/gradle/java.gradle index e83c00b681..48a9270441 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -219,6 +219,10 @@ def isJavaVersionAllowed(JavaVersion version) { return true } +def isJdkForced(String javaName) { + return (project.hasProperty('forceJdk') && project.getProperty('forceJdk').contains(javaName)) +} + // JVM names we would like to run complete test suite on // Note: complete test suite is always run on JVM used for compilation // Note2: apparently there is no way to have a 'global' variable, so instead we have per project @@ -290,7 +294,7 @@ for (def env : System.getenv().entrySet()) { jvmArgs '-XX:CompileCommand=exclude,net.bytebuddy.description.type.TypeDescription$Generic$Visitor$Substitutor::onParameterizedType' } - onlyIf { isJavaVersionAllowed(javaVersion) && isTestingEnabled(javaName) } + onlyIf { (isJavaVersionAllowed(javaVersion) && isTestingEnabled(javaName)) || isJdkForced(javaName) } if (applyCodeCoverage) { jacoco { // Disable jacoco for additional JVM tests to speed things up a bit