ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant build.xml
Date Wed, 20 Feb 2002 08:57:59 GMT
bodewig     02/02/20 00:57:59

  Modified:    .        build.xml
  Log:
  exclude JUnitClassloaderTest if the test classes can be loaded from
  the system classloader.
  
  I'm afraid I didn't beat the nightly GUMP run, expect a nag mail 8-)
  
  Revision  Changes    Path
  1.249     +15 -0     jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.248
  retrieving revision 1.249
  diff -u -r1.248 -r1.249
  --- build.xml	19 Feb 2002 22:46:29 -0000	1.248
  +++ build.xml	20 Feb 2002 08:57:59 -0000	1.249
  @@ -241,6 +241,18 @@
       </condition>
   
       <available property="base64.present" classname="sun.misc.BASE64Encoder" />
  +
  +    <property name="build.tests.resolved" location="${build.tests}" />
  +    <condition property="tests.are.on.system.classpath">
  +      <or>
  +        <!-- relative paths in CLASSPATH -->
  +        <contains string="${java.class.path}"
  +                  substring="${build.tests}" />
  +        <!-- absolute paths in CLASSPATH -->
  +        <contains string="${java.class.path}"
  +                  substring="${build.tests.resolved}" />
  +      </or>
  +    </condition>
     </target>
   
     <!--
  @@ -1000,6 +1012,9 @@
             <!-- uses the context classloader -->
             <exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
                      unless="jdk1.2+"/>
  +          <!-- fails if testcases can be loaded from the system classloader -->
  +          <exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
  +                   if="tests.are.on.system.classpath"/>
   
             <exclude name="${optional.package}/perforce/*.java"
                      unless="jakarta.oro.present" />
  
  
  

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


Mime
View raw message