You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2018/12/05 14:07:25 UTC
ant git commit: bz-62952 Fix the jar-test.xml#testMultiReleaseJar
antunit test case
Repository: ant
Updated Branches:
refs/heads/master 593aff2d2 -> 69269adce
bz-62952 Fix the jar-test.xml#testMultiReleaseJar antunit test case
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/69269adc
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/69269adc
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/69269adc
Branch: refs/heads/master
Commit: 69269adced56238dc80297b9ae881442cd56259c
Parents: 593aff2
Author: Jaikiran Pai <ja...@apache.org>
Authored: Wed Dec 5 19:36:53 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Wed Dec 5 19:36:53 2018 +0530
----------------------------------------------------------------------
src/tests/antunit/taskdefs/jar-test.xml | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/69269adc/src/tests/antunit/taskdefs/jar-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/jar-test.xml b/src/tests/antunit/taskdefs/jar-test.xml
index 63646e2..1ab12ca 100644
--- a/src/tests/antunit/taskdefs/jar-test.xml
+++ b/src/tests/antunit/taskdefs/jar-test.xml
@@ -314,9 +314,22 @@ Main-Class: MyClass
</loadresource>
<au:assertTrue>
<or>
- <equals arg1="Java8" arg2="${valueFrom8}"/>
- <!-- maybe we are running on an early version of Java9 -->
- <equals arg1="Java9" arg2="${valueFrom8}"/>
+ <and>
+ <not>
+ <javaversion atleast="9"/>
+ </not>
+ <equals arg1="Java8" arg2="${valueFrom8}"/>
+ </and>
+
+ <and>
+ <javaversion exactly="9"/>
+ <equals arg1="Java9" arg2="${valueFrom8}"/>
+ </and>
+
+ <and>
+ <javaversion atleast="10"/>
+ <equals arg1="Java10" arg2="${valueFrom8}"/>
+ </and>
</or>
</au:assertTrue>
</target>