ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1577698 - /ant/core/trunk/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
Date Fri, 14 Mar 2014 20:38:31 GMT
Author: bodewig
Date: Fri Mar 14 20:38:31 2014
New Revision: 1577698

URL: http://svn.apache.org/r1577698
Log:
simply doesn't work on java5

Modified:
    ant/core/trunk/src/tests/antunit/taskdefs/taskdef-antlib-test.xml

Modified: ant/core/trunk/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/taskdef-antlib-test.xml?rev=1577698&r1=1577697&r2=1577698&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/taskdef-antlib-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/taskdef-antlib-test.xml Fri Mar 14 20:38:31
2014
@@ -18,7 +18,9 @@
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
     <import file="../antunit-base.xml" />
 
-    <target name="setUp">
+    <!-- Java5 has some trouble with the recursive Antlib lookup -->
+
+    <target name="setUp" if="jdk1.6+">
         <mkdir dir="${input}/org/example" />
         <property name="tmpdir" location="../../../../build/ant-unit/taskdef" />
         <mkdir dir="${tmpdir}" />
@@ -44,14 +46,14 @@
         <sleep seconds="1"/>
     </target>
 
-    <target name="testAntlib" depends="setUp">
+    <target name="testAntlib" depends="setUp" if="jdk1.6+">
         <taskdef classpath="${test.jar}" uri="antlib:org.example"
                  loaderref="loader1"/>
         <echoooo xmlns="antlib:org.example" message="exemple" />
         <au:assertLogContains text="exempleexempleexempleexemple" />
     </target>
 
-    <target name="testURI" depends="setUp">
+    <target name="testURI" depends="setUp" if="jdk1.6+">
         <taskdef classpath="${test.jar}" uri="urn:my:exemple"
                  loaderref="loader2"
                  resource="org/example/antlib.xml" />



Mime
View raw message