ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r447549 - /ant/core/trunk/build.xml
Date Mon, 18 Sep 2006 20:49:21 GMT
Author: mbenson
Date: Mon Sep 18 13:49:21 2006
New Revision: 447549

URL: http://svn.apache.org/viewvc?view=rev&rev=447549
Log:
tests.are.on.system.classpath check didn't work on cygwin.  Replaced
calculation of build\testcases on CLASSPATH with a 1.7 <intersect> for
better portability and dogfood consumption rate.

Modified:
    ant/core/trunk/build.xml

Modified: ant/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/build.xml?view=diff&rev=447549&r1=447548&r2=447549
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Mon Sep 18 13:49:21 2006
@@ -497,19 +497,20 @@
       </and>
     </condition>
 
-    <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}"/>
+        <resourcecount count="1">
+          <intersect>
+            <path path="${java.class.path}" />
+            <file file="${build.tests}" />
+          </intersect>
+        </resourcecount>
         <istrue value="${junit.fork}"/>
       </or>
     </condition>
 
+    <echo level="verbose">$${tests.are.on.system.classpath}=${tests.are.on.system.classpath}</echo>
+
     <condition property="jasper.present">
       <and>
         <available classname="org.apache.jasper.compiler.Compiler"/>
@@ -592,7 +593,6 @@
       </or>
     </condition>
 
-
   </target>
 
 
@@ -1557,8 +1557,7 @@
           forkmode="${junit.forkmode}"
           failureproperty="tests.failed"
           errorproperty="tests.failed"
-          filtertrace="${junit.filtertrace}"
-          >
+          filtertrace="${junit.filtertrace}">
         <sysproperty key="ant.home" value="${ant.home}"/>
         <sysproperty key="build.tests" file="${build.tests}"/>
         <sysproperty key="build.tests.value" value="${build.tests.value}"/>



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


Mime
View raw message