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

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

Author: rachmatowicz at jboss.com
Date: 2010-12-17 14:36:39 -0500 (Fri, 17 Dec 2010)
New Revision: 110019

Modified:
   trunk/testsuite/build.xml
Log:
[JBAS-8540] Fix up stack and address preference selection in testsuite for multicast defaults. 

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2010-12-17 19:34:07 UTC (rev 110018)
+++ trunk/testsuite/build.xml	2010-12-17 19:36:39 UTC (rev 110019)
@@ -211,20 +211,30 @@
 	<!-- this autodiscovery mcast address is used by NamingRestartUnitTestCase and must vary depending on IP stack -->
 	<!-- JBAS-8540 -->
 	<condition property="jbosstest.naming.autodiscovery.mcast_addr" value="230.9.9.9" else="ff0e::9:9:9">
-	  <and>
- 	    <isset property="java.net.preferIPv4Stack"/>
- 	    <istrue value="${java.net.preferIPv4Stack}"/>
-	  </and>	
+	  <or>
+	    <!-- IPv4 stack -->
+		<istrue value="${java.net.preferIPv4Stack}"/>	
+	    <!-- IPv6 stack with IPv4 addresses -->
+	    <and>
+		 <isfalse value="${java.net.preferIPv4Stack}"/>
+		 <isfalse value="${java.net.preferIPv6Addresses}"/>
+	    </and>	
+	  </or>		
 	</condition>	
 	
 	<!-- this mcast address is used by JChannelFactoryClassLoaderLeakTestCase and must vary depending on IP stack -->
 	<!-- JBAS-8540 -->
 	<condition property="jbosstest.jgroups.mcast_addr" value="230.111.111.111" else="ff0e::111:111:111">
+	 <or>
+	  <!-- IPv4 stack -->
+	  <istrue value="${java.net.preferIPv4Stack}"/>	
+	  <!-- IPv6 stack with IPv4 addresses -->
 	  <and>
- 	    <isset property="java.net.preferIPv4Stack"/>
- 	    <istrue value="${java.net.preferIPv4Stack}"/>
+	   <isfalse value="${java.net.preferIPv4Stack}"/>
+	   <isfalse value="${java.net.preferIPv6Addresses}"/>
 	  </and>	
-	</condition>	
+     </or>		
+    </condition>	
 	
    <!-- =================== -->
    <!-- Basic Configuration -->