ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject cvs commit: ant/src/etc/testcases/taskdefs java.xml
Date Fri, 22 Apr 2005 19:54:03 GMT
jkf         2005/04/22 12:54:03

  Modified:    src/etc/testcases/taskdefs java.xml
  Log:
  Somehat more intelligent way to let windows catch up in java test
  PR: 34502
  
  Revision  Changes    Path
  1.16      +11 -9     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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- java.xml	3 Jul 2004 18:33:40 -0000	1.15
  +++ java.xml	22 Apr 2005 19:54:03 -0000	1.16
  @@ -169,10 +169,6 @@
   
       <!--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}"
  @@ -185,10 +181,13 @@
           </java>
   
           <!-- let dumb Windows catch up -->
  -        <waitfor>
  +        <waitfor maxwait="30000">
               <available file="${outfile}" />
           </waitfor>
  -        <sleep milliseconds="${sleeptime}"/>
  +        <waitfor maxwait="30000">
  +            <length file="${outfile}" length="1" when="greater" />
  +        </waitfor>
  +
           <loadfile property="redirect.out.contents" srcfile="${outfile}" />
   
           <condition property="r1file">
  @@ -221,11 +220,14 @@
           </java>
   
           <!-- let dumb Windows catch up -->
  -        <waitfor>
  +        <waitfor maxwait="30000">
               <available file="${outfile}" />
           </waitfor>
  -        <sleep milliseconds="${sleeptime}"/>
  -
  +        <waitfor maxwait="30000">
  +            <length file="${outfile}" length="1" when="greater" />
  +        </waitfor>
  +        
  +        
           <loadfile property="redirect.out.contents2" srcfile="${outfile}" />
   
           <condition property="r2file">
  
  
  

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


Mime
View raw message