You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/10/23 15:54:15 UTC
[3/3] ant git commit: multi-release jar test doesn't completely work
inside Gump
multi-release jar test doesn't completely work inside Gump
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/1ac9459a
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/1ac9459a
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/1ac9459a
Branch: refs/heads/master
Commit: 1ac9459a1e21a79d00d885ccb392609e5256ee48
Parents: b923f8f
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sun Oct 23 17:53:39 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun Oct 23 17:53:39 2016 +0200
----------------------------------------------------------------------
src/tests/antunit/taskdefs/jar-test.xml | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/1ac9459a/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 f1206ed..63646e2 100644
--- a/src/tests/antunit/taskdefs/jar-test.xml
+++ b/src/tests/antunit/taskdefs/jar-test.xml
@@ -249,7 +249,7 @@ Main-Class: MyClass
resource="${output}/META-INF/MANIFEST.MF"/>
</target>
- <target name="testMultiReleaseJar" description="http://openjdk.java.net/jeps/238">
+ <target name="multiReleaseJarPart1" description="http://openjdk.java.net/jeps/238">
<!-- Preparation of the 'MultiRelease-Project' -->
<property name="java8.src" value="${input}/src/java"/>
<property name="java9.src" value="${input}/src/java9"/>
@@ -294,6 +294,17 @@ Main-Class: MyClass
</jar>
<!-- Now some tests -->
+ <au:assertNestedResourceExists>
+ <zipentry zipfile="${antunit.tmpdir}/mrjar.jar" name="META-INF/versions/9/org/apache/ant/test/MRJarTest.class"/>
+ </au:assertNestedResourceExists>
+ <au:assertNestedResourceExists>
+ <zipentry zipfile="${antunit.tmpdir}/mrjar.jar" name="META-INF/versions/10/org/apache/ant/test/MRJarTest.class"/>
+ </au:assertNestedResourceExists>
+ </target>
+
+ <target name="testMultiReleaseJar" depends="multiReleaseJarPart1"
+ unless="build.sysclasspath.only"
+ description="most of the tests happen in , this target contains the part that cannot be tested insid Gump">
<loadresource property="valueFrom8">
<javaconstant name="org.apache.ant.test.MRJarTest.VERSION">
<classpath>
@@ -308,12 +319,6 @@ Main-Class: MyClass
<equals arg1="Java9" arg2="${valueFrom8}"/>
</or>
</au:assertTrue>
- <au:assertNestedResourceExists>
- <zipentry zipfile="${antunit.tmpdir}/mrjar.jar" name="META-INF/versions/9/org/apache/ant/test/MRJarTest.class"/>
- </au:assertNestedResourceExists>
- <au:assertNestedResourceExists>
- <zipentry zipfile="${antunit.tmpdir}/mrjar.jar" name="META-INF/versions/10/org/apache/ant/test/MRJarTest.class"/>
- </au:assertNestedResourceExists>
</target>
</project>