From 11a03b2d6f881fc9e90bb8e1dda42fd0ecefe43a Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Fri, 9 Jul 2004 22:37:17 +0000
Subject: [PATCH] Make ignoremissing test pass on Java 1.2 .

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276684 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/exec/apply.xml | 32 ++++++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/etc/testcases/taskdefs/exec/apply.xml b/src/etc/testcases/taskdefs/exec/apply.xml
index dad2950e1..fabf46b64 100755
--- a/src/etc/testcases/taskdefs/exec/apply.xml
+++ b/src/etc/testcases/taskdefs/exec/apply.xml
@@ -310,13 +310,37 @@
         <touch file="x" />
         <touch file="y" />
 
-        <pathconvert property="xy" pathsep="${line.separator}">
+        <condition property="pad" value="">
+            <or>
+                <not>
+                    <os family="dos" />
+                </not>
+                <not>
+                    <or>
+                        <equals arg1="${ant.java.version}" arg2="1.1" />
+                        <equals arg1="${ant.java.version}" arg2="1.2" />
+                    </or>
+                </not>
+            </or>
+        </condition>
+
+        <condition property="pad" value=" ">
+            <and>
+                <os family="dos" />
+                <or>
+                    <equals arg1="${ant.java.version}" arg2="1.1" />
+                    <equals arg1="${ant.java.version}" arg2="1.2" />
+                </or>
+            </and>
+        </condition>
+
+        <pathconvert property="xy" pathsep="${pad}${line.separator}">
             <path>
                 <filelist refid="xylist" />
             </path>
         </pathconvert>
 
-        <pathconvert property="xyz" pathsep="${line.separator}">
+        <pathconvert property="xyz" pathsep="${pad}${line.separator}">
             <path>
                 <filelist refid="xyzlist" />
             </path>
@@ -336,8 +360,8 @@
             <condition>
                 <not>
                     <and>
-                        <equals arg1="${xy}" arg2="${ignoretrue}" />
-                        <equals arg1="${xyz}" arg2="${ignorefalse}" />
+                        <equals arg1="${xy}${pad}" arg2="${ignoretrue}" />
+                        <equals arg1="${xyz}${pad}" arg2="${ignorefalse}" />
                     </and>
                 </not>
             </condition>