You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/02/14 05:10:12 UTC
[groovy] branch GROOVY_4_0_X updated (f66458b -> 35b2c37)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from f66458b re-enabled JDK18 on travis
new 88c08d4 GROOVY-10479: Disable Ant tests which don't fork under JDK18
new 35b2c37 enable JDK19 on travis
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 4 +++-
.../src/test/groovy/groovy/ant/Groovy8496Test.groovy | 3 +++
.../src/test/groovy/groovy/ant/Groovy8497Test.groovy | 3 +++
.../groovy/org/codehaus/groovy/ant/GroovycTest.java | 20 +++++++++++++++++++-
4 files changed, 28 insertions(+), 2 deletions(-)
[groovy] 01/02: GROOVY-10479: Disable Ant tests which don't fork under JDK18
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 88c08d41f4c3b3d068f855e76a9725e4c675c3d4
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Feb 14 14:29:43 2022 +1000
GROOVY-10479: Disable Ant tests which don't fork under JDK18
---
.../src/test/groovy/groovy/ant/Groovy8496Test.groovy | 3 +++
.../src/test/groovy/groovy/ant/Groovy8497Test.groovy | 3 +++
.../groovy/org/codehaus/groovy/ant/GroovycTest.java | 20 +++++++++++++++++++-
3 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/subprojects/groovy-ant/src/test/groovy/groovy/ant/Groovy8496Test.groovy b/subprojects/groovy-ant/src/test/groovy/groovy/ant/Groovy8496Test.groovy
index 3677d88..6d57696 100644
--- a/subprojects/groovy-ant/src/test/groovy/groovy/ant/Groovy8496Test.groovy
+++ b/subprojects/groovy-ant/src/test/groovy/groovy/ant/Groovy8496Test.groovy
@@ -18,8 +18,11 @@
*/
package groovy.ant
+import static groovy.test.GroovyAssert.isAtLeastJdk
+
class Groovy8496Test extends AntTestCase {
void testGetProperty() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
// def debugLogger = new org.apache.tools.ant.DefaultLogger()
// debugLogger.setMessageOutputLevel(4)
// debugLogger.setOutputPrintStream(System.out)
diff --git a/subprojects/groovy-ant/src/test/groovy/groovy/ant/Groovy8497Test.groovy b/subprojects/groovy-ant/src/test/groovy/groovy/ant/Groovy8497Test.groovy
index 1991c2d..db35a9e 100644
--- a/subprojects/groovy-ant/src/test/groovy/groovy/ant/Groovy8497Test.groovy
+++ b/subprojects/groovy-ant/src/test/groovy/groovy/ant/Groovy8497Test.groovy
@@ -18,12 +18,15 @@
*/
package groovy.ant
+import static groovy.test.GroovyAssert.isAtLeastJdk
+
class Groovy8497Test extends AntTestCase {
void testGetProperty() {
// def debugLogger = new org.apache.tools.ant.DefaultLogger()
// debugLogger.setMessageOutputLevel(4)
// debugLogger.setOutputPrintStream(System.out)
// debugLogger.setErrorPrintStream(System.err)
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
doInTmpDir { ant, baseDir ->
baseDir.src {
diff --git a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
index cec5dd6..393f4ad 100644
--- a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
+++ b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
@@ -34,6 +34,8 @@ import java.net.URISyntaxException;
import java.nio.file.Paths;
import java.util.regex.Pattern;
+import static groovy.test.GroovyAssert.isAtLeastJdk;
+
/**
* Unit tests for the {@link Groovyc} ant task.
* <p>
@@ -119,43 +121,52 @@ public class GroovycTest extends GroovyTestCase {
}
public void testGroovycTest1_NoFork_NoClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_NoFork_NoClasspath");
}
public void testGroovycTest1_NoFork_WithGroovyClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_NoFork_WithGroovyClasspath");
}
public void testGroovycTest1_NoFork_WithJavaClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_NoFork_WithJavaClasspath");
}
public void testGroovycTest1_NoFork_WithBothClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_NoFork_WithBothClasspath");
}
public void testGroovycTest1_ForkGroovy_NoClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_ForkGroovy_NoClasspath");
}
public void testGroovycTest1_ForkGroovy_WithGroovyClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_ForkGroovy_WithGroovyClasspath");
-
}
public void testGroovycTest1_ForkGroovy_WithJavaClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_ForkGroovy_WithJavaClasspath");
}
public void testGroovycTest1_ForkGroovy_WithBothClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_ForkGroovy_WithBothClasspath");
}
public void testGroovycTest1_Joint_NoFork_NoClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_Joint_NoFork_NoClasspath");
}
public void testGroovycTest1_Joint_NoFork_WithGroovyClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_Joint_NoFork_WithGroovyClasspath");
}
@@ -205,26 +216,32 @@ public class GroovycTest extends GroovyTestCase {
}
public void testGroovycTest1_Joint_NoFork_WithJavaClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_Joint_NoFork_WithJavaClasspath");
}
public void testGroovycTest1_Joint_NoFork_WithBothClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_Joint_NoFork_WithBothClasspath");
}
public void testGroovycTest1_Joint_ForkGroovy_NoClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_Joint_ForkGroovy_NoClasspath");
}
public void testGroovycTest1_Joint_ForkGroovy_WithGroovyClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_Joint_ForkGroovy_WithGroovyClasspath");
}
public void testGroovycTest1_Joint_ForkGroovy_WithJavaClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_Joint_ForkGroovy_WithJavaClasspath");
}
public void testGroovycTest1_Joint_ForkGroovy_WithBothClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureExecutes("GroovycTest1_Joint_ForkGroovy_WithBothClasspath");
}
@@ -254,6 +271,7 @@ public class GroovycTest extends GroovyTestCase {
// GROOVY-9197
public void testJointCompilationPropagatesClasspath() {
+ if (isAtLeastJdk("18.0")) return; // GROOVY-10479
ensureNotPresent("MakesExternalReference");
project.executeTarget("jointForkedCompilation_ExternalJarOnClasspath");
ensureResultOK("MakesExternalReference");
[groovy] 02/02: enable JDK19 on travis
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 35b2c37fb96feaf04b508bbf85bec567082c01f3
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Feb 14 15:10:06 2022 +1000
enable JDK19 on travis
---
.travis.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 0556f6a..10c667e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,10 @@ install:
matrix:
include:
+ - env: BC='indy' FEATURE='19' TARGET_JAVA_HOME="/home/travis/openjdk$FEATURE" LICENSE='GPL'
+ jdk: openjdk17
- env: BC='indy' FEATURE='18' TARGET_JAVA_HOME="/home/travis/openjdk$FEATURE" LICENSE='GPL'
- jdk: openjdk16
+ jdk: openjdk17
- env: BC='indy'
jdk: openjdk17
- env: BC='indy'