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/testcases/org/apache/tools/ant BuildFileTest.java
Date Wed, 03 Dec 2003 22:06:41 GMT
antoine     2003/12/03 14:06:41

  Modified:    src/testcases/org/apache/tools/ant Tag: ANT_16_BRANCH
                        BuildFileTest.java
  Log:
  Merge from HEAD
  1) make JarTest pass on Windows, these testcases were failing :
     testRecreateWithUpdateNewerFile
     testRecreateZipfilesetWithUpdateNewerFile,
     the problem is the granularity of time stamps on the FAT
     see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/sysinfo/base/filetime_str.asp
     for more information
  
  2) prevent XalanLiaisonTest and XslpLiaisonTest from running in batch
     when Xerces1 is not available,
  
  3) fix one of the 3 failing testcases (testSimple) from JDependTest
     it was failing due to an overdose of \r in the output coming from
     BuildFileTest
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.24.2.1  +1 -5      ant/src/testcases/org/apache/tools/ant/BuildFileTest.java
  
  Index: BuildFileTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/BuildFileTest.java,v
  retrieving revision 1.24
  retrieving revision 1.24.2.1
  diff -u -r1.24 -r1.24.2.1
  --- BuildFileTest.java	17 Jul 2003 10:39:07 -0000	1.24
  +++ BuildFileTest.java	3 Dec 2003 22:06:41 -0000	1.24.2.1
  @@ -215,11 +215,7 @@
               if (!cr) {
                   cleanedBuffer.append(ch);
               } else {
  -                if (ch == '\n') {
  -                    cleanedBuffer.append(ch);
  -                } else {
  -                    cleanedBuffer.append('\r').append(ch);
  -                }
  +                cleanedBuffer.append(ch);
               }
           }
           return cleanedBuffer.toString();
  
  
  

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


Mime
View raw message