ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r449091 - /ant/core/trunk/build.xml
Date Fri, 22 Sep 2006 21:11:31 GMT
Author: mbenson
Date: Fri Sep 22 14:11:30 2006
New Revision: 449091

URL: http://svn.apache.org/viewvc?view=rev&rev=449091
Log:
disallow mixing of old-style "testcase" property with either of antunit.testcase, junit.testcase,
or both.  Additionally, allow files simply named test.xml in addition to *-test.xml .

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=449091&r1=449090&r2=449091
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Fri Sep 22 14:11:30 2006
@@ -1592,6 +1592,18 @@
       </sequential>
     </macrodef>
 
+    <fail>"testcase" cannot be specified with "junit.testcase" or "antunit.testcase".
+      <condition>
+        <and>
+          <isset property="testcase" />
+          <or>
+            <isset property="antunit.testcase" />
+            <isset property="junit.testcase" />
+          </or>
+        </and>
+      </condition>
+    </fail>
+
     <condition property="antunit.testcase" value="${testcase}">
       <available file="${src.antunit}/${testcase}" />
     </condition>
@@ -1600,6 +1612,20 @@
       <available classname="${testcase}" classpathref="tests-classpath" />
     </condition>
 
+    <fail>Cannot locate test ${testcase}
+      <condition>
+        <and>
+          <isset property="testcase" />
+          <not>
+            <or>
+              <isset property="antunit.testcase" />
+              <isset property="junit.testcase" />
+            </or>
+          </not>
+        </and>
+      </condition>
+    </fail>
+
     <condition property="run.junit">
       <and>
         <not><equals arg1="${testcase}" arg2="${antunit.testcase}" /></not>
@@ -1830,7 +1856,7 @@
           if="run.antunit">
 
     <condition property="antunit.includes" value="${antunit.testcase}"
-               else="**/*-test.xml">
+               else="**/test.xml,*-test.xml">
       <isset property="${antunit.testcase}" />
     </condition>
 



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


Mime
View raw message