You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by mb...@apache.org on 2022/02/16 18:53:00 UTC
[ant] branch master updated (f20a9f3 -> b286069)
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git.
from f20a9f3 use javascript w/ javax for scriptcondition return tests
new d2e4efa propagate same properties as build.xml antunit invocation
new b286069 skip tests relying on Javascript when running in Jenkins w/ JDK >= 15
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:
src/tests/antunit/antunit-base.xml | 5 ++++
.../types/optional/scriptcondition-test.xml | 30 +++++++++++++++-------
2 files changed, 26 insertions(+), 9 deletions(-)
[ant] 02/02: skip tests relying on Javascript when running in Jenkins w/ JDK >= 15
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
commit b286069d212f1921d67b0c82c8f6f9f0d25b4539
Author: Matt Benson <mb...@apache.org>
AuthorDate: Wed Feb 16 12:52:22 2022 -0600
skip tests relying on Javascript when running in Jenkins w/ JDK >= 15
---
.../types/optional/scriptcondition-test.xml | 30 +++++++++++++++-------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/tests/antunit/types/optional/scriptcondition-test.xml b/src/tests/antunit/types/optional/scriptcondition-test.xml
index 6a1b346..d136b0d 100644
--- a/src/tests/antunit/types/optional/scriptcondition-test.xml
+++ b/src/tests/antunit/types/optional/scriptcondition-test.xml
@@ -18,13 +18,25 @@
<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
<import file="../../antunit-base.xml" />
- <target name="test-default-behavior">
+ <target name="setUp">
+ <condition property="expect-js">
+ <not>
+ <and>
+ <isset property="jenkins" />
+ <javaversion atleast="15" />
+ </and>
+ </not>
+ </condition>
+ <echo>$${expect-js}=${expect-js}</echo>
+ </target>
+
+ <target name="test-default-behavior" depends="setUp" if="expect-js">
<au:assertFalse>
<scriptcondition language="javascript" />
</au:assertFalse>
</target>
- <target name="test-set-value-true">
+ <target name="test-set-value-true" depends="setUp" if="expect-js">
<au:assertTrue>
<scriptcondition language="javascript">
self.setValue(true);
@@ -32,7 +44,7 @@
</au:assertTrue>
</target>
- <target name="test-set-value-false">
+ <target name="test-set-value-false" depends="setUp" if="expect-js">
<au:assertFalse>
<scriptcondition language="javascript">
self.setValue(false);
@@ -40,19 +52,19 @@
</au:assertFalse>
</target>
- <target name="test-default-value-true">
+ <target name="test-default-value-true" depends="setUp" if="expect-js">
<au:assertTrue>
<scriptcondition language="javascript" value="true" />
</au:assertTrue>
</target>
- <target name="test-default-value-false">
+ <target name="test-default-value-false" depends="setUp" if="expect-js">
<au:assertFalse>
<scriptcondition language="javascript" value="false" />
</au:assertFalse>
</target>
- <target name="test-default-value-override-true">
+ <target name="test-default-value-override-true" depends="setUp" if="expect-js">
<au:assertTrue>
<scriptcondition language="javascript" value="false">
self.setValue(true);
@@ -60,7 +72,7 @@
</au:assertTrue>
</target>
- <target name="test-default-value-override-false">
+ <target name="test-default-value-override-false" depends="setUp" if="expect-js">
<au:assertFalse>
<scriptcondition language="javascript" value="true">
self.setValue(false);
@@ -68,7 +80,7 @@
</au:assertFalse>
</target>
- <target name="test-return-value-true">
+ <target name="test-return-value-true" depends="setUp" if="expect-js">
<au:assertTrue>
<scriptcondition language="javascript" manager="javax">
true
@@ -76,7 +88,7 @@
</au:assertTrue>
</target>
- <target name="test-return-value-false">
+ <target name="test-return-value-false" depends="setUp" if="expect-js">
<au:assertFalse>
<scriptcondition language="javascript" manager="javax" value="true">
false
[ant] 01/02: propagate same properties as build.xml antunit invocation
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
commit d2e4efab2a10e50699d44e5cc7e7ab9b0f49bebc
Author: Matt Benson <mb...@apache.org>
AuthorDate: Wed Feb 16 12:51:36 2022 -0600
propagate same properties as build.xml antunit invocation
---
src/tests/antunit/antunit-base.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/tests/antunit/antunit-base.xml b/src/tests/antunit/antunit-base.xml
index 1336f2c..48226b8 100644
--- a/src/tests/antunit/antunit-base.xml
+++ b/src/tests/antunit/antunit-base.xml
@@ -51,6 +51,11 @@
<antunit xmlns="antlib:org.apache.ant.antunit">
<plainlistener />
<file file="${ant.file}" xmlns="antlib:org.apache.tools.ant" />
+ <propertyset>
+ <propertyref name="antunit.tmpdir"/>
+ <propertyref name="ant.home"/>
+ <propertyref name="jenkins"/>
+ </propertyset>
</antunit>
</target>