[ant] branch graal.js updated (624a0fc -> 0da9e3d)

[bo...@apache.org]

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

bodewig pushed a change to branch graal.js
in repository https://gitbox.apache.org/repos/asf/ant.git.


 discard 624a0fc  run scriptdef test with graal.js instead of Nashorn
 discard ef1065e  download graal.js so we can use it in tests
     add 6a95350  fix two typos in rmic manual page
     add 4f062bf  Merge pull request #127 from esaulpaugh/master
     add e92205f  fix typo
     add 80ed3a1  Merge pull request #128 from XenoAmess/patch-1
     add 19ed753  download graal.js so we can use it in tests
     new 0da9e3d  run scriptdef test with graal.js instead of Nashorn

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (624a0fc)
            \
             N -- N -- N   refs/heads/graal.js (0da9e3d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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:
 CONTRIBUTING.md        | 2 +-
 manual/Tasks/rmic.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[ant] 01/01: run scriptdef test with graal.js instead of Nashorn

[bo...@apache.org]

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

bodewig pushed a commit to branch graal.js
in repository https://gitbox.apache.org/repos/asf/ant.git

commit 0da9e3d77f7b8dd43520e1a1b02fdf008f6d8ea1
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Wed May 27 08:10:43 2020 +0200

    run scriptdef test with graal.js instead of Nashorn
---
 build.xml                                                             | 1 +
 src/etc/testcases/taskdefs/optional/script/scriptdef.xml              | 4 ++--
 .../org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java  | 4 ----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 4e157d6..829e829 100644
--- a/build.xml
+++ b/build.xml
@@ -1749,6 +1749,7 @@ ${antunit.reports}
                failureproperty="junit.failed"
                errorproperty="junit.failed"
                filtertrace="${junit.filtertrace}">
+          <sysproperty key="polyglot.js.nashorn-compat" value="true"/>
           <sysproperty key="ant.home" value="${ant.home}"/>
           <sysproperty key="build.classes.value" value="${build.classes.value}"/>
           <sysproperty key="build.tests.value" value="${build.tests.value}"/>
diff --git a/src/etc/testcases/taskdefs/optional/script/scriptdef.xml b/src/etc/testcases/taskdefs/optional/script/scriptdef.xml
index 37829c5..c991490 100644
--- a/src/etc/testcases/taskdefs/optional/script/scriptdef.xml
+++ b/src/etc/testcases/taskdefs/optional/script/scriptdef.xml
@@ -164,7 +164,7 @@
 
   <target name="useCompiled">
     <!-- Test with 'javax' manager, 'bsf' manager already compiles the script. -->
-    <scriptdef manager="javax" name="heavyscript" language="javascript" src="heavy-script.js" encoding="UTF-8" compiled="true"/>
+    <scriptdef manager="javax" name="heavyscript" language="graal.js" src="heavy-script.js" encoding="UTF-8" compiled="true"/>
 
     <heavyscript/>
     <heavyscript/>
@@ -189,7 +189,7 @@
   </target>
 
   <target name="useNotCompiled">
-    <scriptdef manager="javax" name="heavyscriptNotCompiled" language="javascript" src="heavy-script.js" encoding="UTF-8" compiled="false"/>
+    <scriptdef manager="javax" name="heavyscriptNotCompiled" language="graal.js" src="heavy-script.js" encoding="UTF-8" compiled="false"/>
 
     <heavyscriptNotCompiled/>
     <heavyscriptNotCompiled/>
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 814b178..39d8729 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
@@ -21,7 +21,6 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileRule;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.util.JavaEnvUtils;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -30,7 +29,6 @@ import org.junit.rules.ExpectedException;
 import java.io.File;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assume.assumeFalse;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -157,8 +155,6 @@ public class ScriptDefTest {
 
     @Test
     public void testUseCompiled() {
-        assumeFalse("Current system is Java 15 or newer", JavaEnvUtils.isAtLeastJavaVersion("15"));
-
         final long duration;
         {
             long start = System.nanoTime();