[ant] branch master updated: Prevent CI job failures on Java 15+ for ScriptDefTest

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jaikiran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git


The following commit(s) were added to refs/heads/master by this push:
     new ca58214  Prevent CI job failures on Java 15+ for ScriptDefTest
ca58214 is described below

commit ca5821430b7a660449c789cfbd587c7a77c7c035
Author: Jaikiran Pai <ja...@apache.org>
AuthorDate: Sat Nov 21 19:31:17 2020 +0530

    Prevent CI job failures on Java 15+ for ScriptDefTest
---
 .../apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
index 667db43..4ebf3d6 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
@@ -20,7 +20,9 @@ package org.apache.tools.ant.taskdefs.optional.script;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileRule;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.condition.JavaVersion;
 import org.apache.tools.ant.types.FileSet;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -155,7 +157,11 @@ public class ScriptDefTest {
 
     @Test
     public void testUseCompiled() {
-
+        final JavaVersion atMostJava14 = new JavaVersion();
+        atMostJava14.setAtMost("14");
+        // skip execution since this compilation timing based test consistently fails starting Java 15 (where we use
+        // Graal libraries for Javascript engine)
+        Assume.assumeTrue("Skipping test execution since Java version is greater than Java 14", atMostJava14.eval());
         final long duration;
         {
             long start = System.nanoTime();