darrell 02/03/29 17:59:31
Modified: proposal/myrmidon build.xml
Log:
* Added test for Ant version, so that Ant1Compat tests now run automatically
when run under Ant1.5.
Revision Changes Path
1.96 +14 -2 jakarta-ant/proposal/myrmidon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/build.xml,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- build.xml 30 Mar 2002 01:19:17 -0000 1.95
+++ build.xml 30 Mar 2002 01:59:31 -0000 1.96
@@ -184,6 +184,17 @@
classpathref="project.class.path"/>
</and>
</condition>
+
+ <!-- Check for Ant version 1.5 -->
+ <property resource="org/apache/tools/ant/version.txt"
+ classpath="${java.class.path}"/>
+
+ <condition property="ant1.5">
+ <or>
+ <equals arg1="${VERSION}" arg2="1.5alpha"/>
+ <equals arg1="${VERSION}" arg2="1.5"/>
+ </or>
+ </condition>
</target>
<!-- Compiles and installs the custom build tasks -->
@@ -623,8 +634,9 @@
<exclude name="**/SmbFileSystemTestCase.class"
unless="test.smb"/>
<exclude name="**/FtpFileSystemTestCase.class"
unless="test.ftp"/>
- <!-- Need Ant1.5+ to run Ant1Compat tests, because of
fixes to JUnit -->
- <exclude name="**/Ant1CompatTestCase.class"
unless="single.test"/>
+ <!-- Need Ant1.5+ to run Ant1Compat tests, because of
classpath
+ problems in Ant1.4 JUnit Task (prepends ant.jar to
classpath) -->
+ <exclude name="**/Ant1CompatTestCase.class"
unless="ant1.5"/>
<!-- This test fails, as it has no test methods -->
<exclude name="**/SimpleConvertersTestCase.class"
unless="single.test"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
