conor 02/04/05 04:55:01
Modified: . build.xml
src/etc/testcases/taskdefs/optional/depend depend.xml
Log:
Re-enable DependTest - no longer uses touch
Update many checks to handle optional tasks which require JDK 1.2+
Problems remain for builds with ORO present
Revision Changes Path
1.284 +17 -10 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -w -u -r1.283 -r1.284
--- build.xml 5 Apr 2002 03:23:24 -0000 1.283
+++ build.xml 5 Apr 2002 12:55:01 -0000 1.284
@@ -122,8 +122,6 @@
unless="jdk1.2+" />
<exclude name="${optional.package}/metamata/*.java"
unless="jdk1.2+" />
- <exclude name="${util.package}/depend/*.java"
- unless="jdk1.2+" />
<exclude name="${optional.package}/ejb/EjbJar.java"
unless="jdk1.2+" />
<exclude name="${optional.package}/ejb/*DeploymentTool.java"
@@ -133,6 +131,9 @@
<!-- uses the context classloader -->
<exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
unless="jdk1.2+" />
+ <!-- use various 1.2 methods -->
+ <exclude name="${optional.package}/sitraka/**/*.java"
+ unless="jdk1.2+" />
</patternset>
<patternset id="needs.jdk1.3+">
<exclude name="${ant.package}/taskdefs/TestProcess.java"
@@ -205,7 +206,7 @@
unless="bcel.present" />
<exclude name="${util.package}/depend/bcel/*.java"
unless="bcel.present" />
- <exclude name="${optional.type.package}/depend/*.java"
+ <exclude name="${optional.type.package}/depend/ClassFileSetTest.java"
unless="bcel.present" />
</patternset>
<patternset id="needs.jakarta.log4j">
@@ -380,9 +381,13 @@
<available property="xerces.present"
classname="org.apache.xerces.parsers.SAXParser"
classpathref="classpath" />
- <available property="bcel.present"
- classname="org.apache.bcel.Constants"
+ <condition property="bcel.present">
+ <and>
+ <isset property="jdk1.2+"/>
+ <available classname="org.apache.bcel.Constants"
classpathref="classpath" />
+ </and>
+ </condition>
<available property="sunuue.present"
classname="sun.misc.UUEncoder"
classpathref="classpath" />
@@ -1181,6 +1186,11 @@
<patternset refid="needs.xalan1" />
<patternset refid="needs.xslp" />
<patternset refid="needs.jakarta.bcel" />
+ <patternset refid="needs.trax" />
+
+ <!-- fails under 1.1 -->
+ <exclude name="${optional.package}/perforce/P4ChangeTest.java"
+ unless="jdk1.2+"/>
<!-- tests excluded if the test is run in offline mode -->
<patternset refid="onlinetests"/>
@@ -1216,9 +1226,6 @@
unless="jdk1.2+" />
<!-- DateTime handling seems to be broken in JDK 1.1 -->
<exclude name="${util.package}/DateUtilsTest.java"
- unless="jdk1.2+" />
- <!-- test needs a working touch task -->
- <exclude name="${optional.package}/depend/DependTest.java"
unless="jdk1.2+" />
<exclude name="${optional.package}/JspcTest.java"
1.3 +4 -2 jakarta-ant/src/etc/testcases/taskdefs/optional/depend/depend.xml
Index: depend.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/optional/depend/depend.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- depend.xml 4 Apr 2002 14:12:19 -0000 1.2
+++ depend.xml 5 Apr 2002 12:55:01 -0000 1.3
@@ -27,14 +27,16 @@
<target name="testdirect" depends="compile">
<sleep seconds="3"/>
- <touch file="${tempsrc.dir}/C.java"/>
+ <delete file="${tempsrc.dir}/C.java"/>
+ <copy file="${cvssrc.dir}/C.java" tofile="${tempsrc.dir}/C.java"/>
<depend srcdir="${tempsrc.dir}" destdir="${classes.dir}"/>
<fileset id="result" dir="${classes.dir}"/>
</target>
<target name="testclosure" depends="compile">
<sleep seconds="3"/>
- <touch file="${tempsrc.dir}/C.java"/>
+ <delete file="${tempsrc.dir}/C.java"/>
+ <copy file="${cvssrc.dir}/C.java" tofile="${tempsrc.dir}/C.java"/>
<depend srcdir="${tempsrc.dir}" destdir="${classes.dir}" closure="yes"/>
<fileset id="result" dir="${classes.dir}"/>
</target>
--
To unsubscribe, e-mail: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>
|