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/taskdefs JarTest.java
Date Wed, 03 Dec 2003 22:06:41 GMT
antoine     2003/12/03 14:06:41

  Modified:    src/testcases/org/apache/tools/ant/taskdefs Tag:
                        ANT_16_BRANCH JarTest.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.22.2.1  +6 -1      ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
  
  Index: JarTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java,v
  retrieving revision 1.22
  retrieving revision 1.22.2.1
  diff -u -r1.22 -r1.22.2.1
  --- JarTest.java	3 Apr 2003 06:06:00 -0000	1.22
  +++ JarTest.java	3 Dec 2003 22:06:41 -0000	1.22.2.1
  @@ -66,6 +66,7 @@
   import java.util.zip.ZipEntry;
   import java.util.zip.ZipFile;
   import org.apache.tools.ant.BuildFileTest;
  +import org.apache.tools.ant.taskdefs.condition.Os;
   
   /**
    * @author Erik Meade <emeade@geekfarm.org>
  @@ -160,8 +161,12 @@
   
       private void testRecreate(String firstTarget, String secondTarget) {
           executeTarget(firstTarget);
  +        int sleeptime = 2500;
  +        if (Os.isFamily("windows")) {
  +            sleeptime += 2500;
  +        }
           try {
  -            Thread.currentThread().sleep(2500);
  +            Thread.currentThread().sleep(sleeptime);
           } catch (InterruptedException e) {
           } // end of try-catch
           File jarFile = new File(getProjectDir(), tempJar);
  
  
  

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


Mime
View raw message