svn commit: r652705 - in /incubator/qpid/trunk/qpid/java: module.xml systests/build.xml

[rh...@apache.org]

Author: rhs
Date: Thu May  1 16:03:31 2008
New Revision: 652705

URL: http://svn.apache.org/viewvc?rev=652705&view=rev
Log:
QPID-1003: added excludes for framework test classes

Modified:
    incubator/qpid/trunk/qpid/java/module.xml
    incubator/qpid/trunk/qpid/java/systests/build.xml

Modified: incubator/qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=652705&r1=652704&r2=652705&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Thu May  1 16:03:31 2008
@@ -69,11 +69,14 @@
       <istrue value="${module.plugin}"/>
     </and>
   </condition>
-  <property name="module.test.jar" location="${build.lib}/${project.name}-${module.name}-tests-${project.version}.jar"/>
+
+  <property name="module.test.jar"
+            location="${build.lib}/${project.name}-${module.name}-tests-${project.version}.jar"/>
 
   <!-- module.depends and module.test.depends are supplied by the importing file -->
-  <property name="module.depends"      value=""/>
-  <property name="module.test.depends" value=""/>
+  <property name="module.depends"       value=""/>
+  <property name="module.test.depends"  value=""/>
+  <property name="module.test.excludes" value=""/>
 
   <map property="module.depends.path" value="${module.depends}" join="${path.separator}">
     <globmapper from="*" to="${build}/*/classes"/>
@@ -172,10 +175,10 @@
   <property name="java.naming.factory.initial" value="org.apache.qpid.jndi.PropertiesFileInitialContextFactory"/>
 
   <condition property="config" value="${profile}.testprofile" else="default.testprofile">
-      <and>
-          <isset property="profile"/>
-          <available file="${project.root}/${profile}.testprofile" type="file"/>
-      </and>
+    <and>
+      <isset property="profile"/>
+      <available file="${project.root}/${profile}.testprofile" type="file"/>
+    </and>
   </condition>
 
   <property file="${project.root}/${config}"/>
@@ -208,8 +211,7 @@
       <classpath refid="module.test.path"/>
 
       <batchtest fork="${test.fork}" todir="${build.results}">
-        <fileset dir="${module.test.src}">
-          <include name="**/${test1}.java"/>
+        <fileset dir="${module.test.src}" excludes="${module.test.excludes}">
           <include name="**/${test}.java"/>
         </fileset>
       </batchtest>

Modified: incubator/qpid/trunk/qpid/java/systests/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/build.xml?rev=652705&r1=652704&r2=652705&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/systests/build.xml Thu May  1 16:03:31 2008
@@ -22,6 +22,8 @@
 
     <property name="module.depends" value="client broker common junit-toolkit"/>
     <property name="module.test.src" location="src/main/java"/>
+    <property name="module.test.excludes"
+              value="**/DropInTest.java,**/TestClientControlledTest.java"/>
 
     <import file="../module.xml"/>