[jboss-cvs] JBossAS SVN: r81979 - trunk/testsuite.

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

Author: bstansberry at jboss.com
Date: 2008-12-02 15:01:49 -0500 (Tue, 02 Dec 2008)
New Revision: 81979

Modified:
   trunk/testsuite/build.xml
Log:
Add logic to set a system property based on java.vendor
[JBAS-5959] Exclude classloader leak tests that fail only on Sun if testsuite is on Sun

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2008-12-02 19:57:41 UTC (rev 81978)
+++ trunk/testsuite/build.xml	2008-12-02 20:01:49 UTC (rev 81979)
@@ -53,6 +53,19 @@
        do not checkin your local.properties file into CVS-->
    <property file="local.properties"/>
 
+   <!-- Set a property if we know this is a Sun VM. Can be
+        used to enable/disable things based on VM vendor -->
+   <condition property="sun-vm" value="true">
+   	  <and>
+         <equals arg1="Sun Microsystems Inc." arg2="${java.vendor}" trim="true"/>
+   	  	 <not>
+   	  	 	<!-- Pass -Dignore.sun-vm.override=true to ant to bypass
+   	  	 	     enabling/disabling things based on Sun being VM vendor -->
+   	  	 	<isset property="ignore.sun-vm.override"/>
+   	  	 </not>
+   	  </and>
+   </condition>
+
    <!-- Cluster node0 defaults -->
    <property name="node0" value="localhost" />
    <property name="node0.http.url" value="http://${node0}:8080" />
@@ -893,6 +906,11 @@
       <exclude name="org/jboss/test/web/test/JASPIFormAuthUnitTestCase.class"/>
    	<!-- New diagnostic test that has transient failures; needs further work -->
    	<exclude name="org/jboss/test/cluster/defaultcfg/simpleweb/test/ClusteredSessionMemoryLeakTestCase.class"/>
+   	
+   	<!-- Exclude some classloader leak tests on Sun VM only; they should run on JRockit -->
+   	<exclude name="org/jboss/test/classloader/leak/test/AopPreparedClassesClassloaderLeakUnitTestCase.class" if="sun-vm"/>
+   	<exclude name="org/jboss/test/cluster/classloader/leak/test/FieldGranularityClassloaderLeakUnitTestCase.class" if="sun-vm"/>
+   		
    </patternset>
 
    <patternset id="aop-with-classloader.excludes">
@@ -2925,6 +2943,7 @@
 
         <fileset dir="${build.classes}">
           <patternset refid="classloader-leak.includes"/>
+          <patternset refid="badtest.excludes"/>
         </fileset>
       </batchtest>
     </junit>