[jboss-cvs] JBossAS SVN: r106342 - branches/Branch_No_Multicast/testsuite.

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

Author: smarlow at redhat.com
Date: 2010-06-30 07:28:18 -0400 (Wed, 30 Jun 2010)
New Revision: 106342

Modified:
   branches/Branch_No_Multicast/testsuite/build.xml
Log:
apply ec2.excludes to tests-client-unit and also exclude CachedConnectionErrorUnitTestCase

Modified: branches/Branch_No_Multicast/testsuite/build.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/build.xml	2010-06-30 09:54:28 UTC (rev 106341)
+++ branches/Branch_No_Multicast/testsuite/build.xml	2010-06-30 11:28:18 UTC (rev 106342)
@@ -1498,6 +1498,8 @@
      <exclude name="org/jboss/test/cluster/defaultcfg/simpleweb/test/*TestCase.class"/>
      <!-- These tests depend on DownloadServerClasses=true which is currently false -->
      <exclude name="org/jboss/test/jrmp/test/DynLoadingFromSARUnitTestCase.class"/>
+     <!-- This test expects a session bean call that leaks a db connection to result in a remote exception.  That is a debug feature that is disabled  -->
+     <exclude name="org/jboss/test/jca/test/CachedConnectionErrorUnitTestCase.class"/>
 	</patternset>
 
    <!-- A target that allows for conditional dependency on the compilation and
@@ -1631,6 +1633,7 @@
    <target name="jboss-all-config-tests"
       description="The units tests which are run against the jboss all config" depends="init">
    	
+
    	<!-- Default configuration to run the tests against -->
    	<property name="conf" value="all"/>
    	       
@@ -1643,8 +1646,14 @@
  	  	  tofile="${jboss.dist}/server/${conf}/conf/props/hornetq-users.properties" overwrite="true"/>
     
    	  <server:start name="${conf}"/>
-      <antcall target="tests-standard-unit"/>
-      <antcall target="tests-client-unit"/>
+      <antcall target="tests-standard-unit">
+         <param name="custom.excludes" value="ec2.excludes"/>
+      </antcall>
+
+      <antcall target="tests-client-unit">
+         <param name="custom.excludes" value="ec2.excludes"/>
+      </antcall>
+
       <antcall target="tests-security-basic-unit"/>
       <antcall target="tests-standard-stress"/>
       <antcall target="tests-jbossmx-compliance"/>
@@ -2254,6 +2263,7 @@
    <target name="tests-client-unit">
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
+      <property name="custom.excludes" value="empty.patternset"/>
       <junit dir="${module.output}"
          printsummary="${junit.printsummary}"
          haltonerror="${junit.haltonerror}"
@@ -2263,6 +2273,7 @@
          jvm="${junit.jvm}">
 
          <jvmarg line="${junit.jvm.options}"/>
+
          <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
          <sysproperty key="jbosstest.secure" value="true"/>
          <sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -2301,6 +2312,7 @@
                <include name="org/jboss/test/jrmp/test/DynLoadingUnitTestCase.class"/>
                <include name="org/jboss/test/jrmp/test/DynLoadingFromSARUnitTestCase.class"/>
                <include name="org/jboss/test/jrmp/test/DynLoadingFromSARUnpackedUnitTestCase.class"/>
+               <patternset refid="${custom.excludes}"/>
             </fileset>
          </batchtest>
       </junit>
@@ -4005,6 +4017,8 @@
          <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
          -->
 
+         <!--jvmarg value="-Djava.security.debug=all"/ -->
+
          <!-- Used for JGroups -->
          <jvmarg value="-Dbind.address=${node0}"/>
          <sysproperty key="jboss.dist" value="${jboss.dist}"/>