ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject cvs commit: ant build.xml
Date Fri, 11 Mar 2005 19:34:00 GMT
mbenson     2005/03/11 11:34:00

  Modified:    .        Tag: ANT_16_BRANCH build.xml
  Log:
  Merge DirectoryScanner improvements;
  disable ClasspathUtilsTest if tests.and.ant.share.classloader
  PR: 33118
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.392.2.39 +8 -1      ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ant/build.xml,v
  retrieving revision 1.392.2.38
  retrieving revision 1.392.2.39
  diff -u -r1.392.2.38 -r1.392.2.39
  --- build.xml	18 Feb 2005 13:46:03 -0000	1.392.2.38
  +++ build.xml	11 Mar 2005 19:34:00 -0000	1.392.2.39
  @@ -1541,6 +1541,8 @@
             <!--  These tests only passes if testcases and Ant classes have
             been loaded by the same classloader - will throw
             IllegalAccessExceptions otherwise.  -->
  +          <exclude name="${ant.package}/DirectoryScannerTest.java"
  +                   unless="tests.and.ant.share.classloader"/>
             <exclude name="${ant.package}/taskdefs/SQLExecTest.java"
                      unless="tests.and.ant.share.classloader"/>
             <exclude name="${optional.package}/sos/SOSTest.java"
  @@ -1567,6 +1569,11 @@
   
             <!-- test needs special setup -->
             <exclude name="${optional.package}/ssh/ScpTest.java"/>
  +
  +          <!-- test fails if build/classes and ant.jar are using the same
  +               classloader -->
  +          <exclude name="${ant.package}/util/ClasspathUtilsTest.java"
  +            if="tests.and.ant.share.classloader"/>
           </fileset>
         </batchtest>
       </junit>
  @@ -1613,4 +1620,4 @@
             description="--> creates a minimum distribution in ./dist"
             depends="dist-lite"/>
   
  -</project>
  \ No newline at end of file
  +</project>
  
  
  

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


Mime
View raw message