[jboss-cvs] JBoss Messaging SVN: r6204 - branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1456/tests.

[jboss-cvs-commits at lists.jboss.org]

Author: jbertram at redhat.com
Date: 2009-03-27 14:57:23 -0400 (Fri, 27 Mar 2009)
New Revision: 6204

Modified:
   branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1456/tests/build.xml
Log:
[JBPAPP-1836]

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1456/tests/build.xml
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1456/tests/build.xml	2009-03-27 17:12:43 UTC (rev 6203)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1456/tests/build.xml	2009-03-27 18:57:23 UTC (rev 6204)
@@ -346,30 +346,6 @@
          <!--
          <jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=antjunit"/>
          -->
-<<<<<<< .working
-         <classpath refid="test.execution.classpath"/>
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
-         <batchtest todir="${junit.batchtest.todir}"
-                    haltonfailure="${junit.batchtest.haltonfailure}"
-                    haltonerror="${junit.batchtest.haltonerror}">
-            <formatter type="plain" usefile="${junit.formatter.usefile}"/>
-            <fileset dir="${build.tests.classes}">
-	       <include name="**/messaging/core/**/${test-mask}.class"/>
-	       <include name="**/jms/**/${test-mask}.class"/>
-               <include name="**/messaging/util/**/${test-mask}.class"/>
-               <exclude name="**/jms/MemLeakTest.class"/>
-               <exclude name="**/jms/RemotingConnectionConfigurationTest.class"/>
-               <exclude name="**/jms/XAResourceRecoveryTest.class"/>
-               <exclude name="**/jms/stress/**"/>
-               <exclude name="**/jms/crash/**"/>
-               <exclude name="**/jms/bridge/**"/>
-               <exclude name="**/jms/manual/**"/>
-               <exclude name="**/jms/clustering/**"/>
-            </fileset>
-         </batchtest>
-      </junit>
-   </target>
-=======
 			<classpath refid="test.execution.classpath" />
 			<formatter type="xml" usefile="${junit.formatter.usefile}" />
 			<batchtest todir="${junit.batchtest.todir}" haltonfailure="${junit.batchtest.haltonfailure}" haltonerror="${junit.batchtest.haltonerror}">
@@ -391,7 +367,6 @@
 			</batchtest>
 		</junit>
 	</target>
->>>>>>> .merge-right.r6192
 
    <target name="invm-thirdparty-tests" depends="tests-jar, prepare-testdirs, clear-test-logs"
            description="Runs all available thirdparty tests an in-VM configuration">