ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject cvs commit: ant/src/etc/testcases/taskdefs/exec apply.xml
Date Fri, 09 Jul 2004 22:37:18 GMT
mbenson     2004/07/09 15:37:18

  Modified:    src/etc/testcases/taskdefs/exec apply.xml
  Log:
  Make ignoremissing test pass on Java 1.2 .
  
  Revision  Changes    Path
  1.4       +28 -4     ant/src/etc/testcases/taskdefs/exec/apply.xml
  
  Index: apply.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/exec/apply.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apply.xml	16 Jun 2004 16:41:38 -0000	1.3
  +++ apply.xml	9 Jul 2004 22:37:17 -0000	1.4
  @@ -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>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message