From 2f3ac92eb4e9ebf75c7bec7b46faf4f315d9317c Mon Sep 17 00:00:00 2001
From: Darrell DeBoer <darrell@apache.org>
Date: Sat, 30 Mar 2002 01:59:31 +0000
Subject: [PATCH] * Added test for Ant version, so that Ant1Compat tests now
 run automatically   when run under Ant1.5.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272102 13f79535-47bb-0310-9956-ffa450edef68
---
 proposal/myrmidon/build.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/proposal/myrmidon/build.xml b/proposal/myrmidon/build.xml
index 40f698156..58217bfd1 100644
--- a/proposal/myrmidon/build.xml
+++ b/proposal/myrmidon/build.xml
@@ -184,6 +184,17 @@ Legal:
                     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 @@ Legal:
                     <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"/>