ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/etc/testcases/taskdefs java.xml
Date Sat, 03 Jul 2004 18:35:00 GMT
antoine     2004/07/03 11:35:00

  Modified:    src/etc/testcases/taskdefs Tag: ANT_16_BRANCH java.xml
  Log:
  Merge from HEAD
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.11.2.2  +6 -1      ant/src/etc/testcases/taskdefs/java.xml
  
  Index: java.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/java.xml,v
  retrieving revision 1.11.2.1
  retrieving revision 1.11.2.2
  diff -u -r1.11.2.1 -r1.11.2.2
  --- java.xml	23 Jun 2004 19:17:12 -0000	1.11.2.1
  +++ java.xml	3 Jul 2004 18:35:00 -0000	1.11.2.2
  @@ -169,6 +169,10 @@
   
       <!--redirection testcases don't want to run under junit unless forked-->
       <target name="redirect1">
  +        <condition property="sleeptime" value="2000">
  +            <os family="windows"/>
  +        </condition>
  +        <property name="sleeptime" value="1"/>
           <property name="outfile" location="${tmp}/redirect.out" />
   
           <java classname="${pipeapp}"
  @@ -184,7 +188,7 @@
           <waitfor>
               <available file="${outfile}" />
           </waitfor>
  -
  +        <sleep milliseconds="${sleeptime}"/>
           <loadfile property="redirect.out.contents" srcfile="${outfile}" />
   
           <condition property="r1file">
  @@ -220,6 +224,7 @@
           <waitfor>
               <available file="${outfile}" />
           </waitfor>
  +        <sleep milliseconds="${sleeptime}"/>
   
           <loadfile property="redirect.out.contents2" srcfile="${outfile}" />
   
  
  
  

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


Mime
View raw message