[jboss-cvs] JBossAS SVN: r93786 - in trunk/testsuite: imports and 1 other directory.

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

Author: smcgowan at redhat.com
Date: 2009-09-19 22:24:50 -0400 (Sat, 19 Sep 2009)
New Revision: 93786

Modified:
   trunk/testsuite/build.xml
   trunk/testsuite/imports/server-config.xml
Log:
JBAS-6913 - fix compatibility tests matrix

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2009-09-20 02:12:58 UTC (rev 93785)
+++ trunk/testsuite/build.xml	2009-09-20 02:24:50 UTC (rev 93786)
@@ -845,7 +845,7 @@
    <!-- ================================================================== -->
 
    <macrodef name="wait-on-host">
-      <attribute name="seconds" default="60"/>
+      <attribute name="seconds" default="120"/>
       <attribute name="host" default="${node0}"/>
       <sequential>
          <echo message="Waiting for @{host} to start..."/>
@@ -3836,8 +3836,7 @@
       </style>
    </target>
 
-   <target name="tests-matrix" description="Executes only the version check compatibility suite. Use -Dmatrix-versions=[version container] for this task" depends="maybejars" if="matrix-versions"> 
- 
+   <target name="tests-matrix" description="Executes only the version check compatibility suite. Use -Dmatrix-versions=[version container] for this task" depends="maybejars, init" if="matrix-versions"> 
      <fail message="Use -Dmatrix-versions=[version container] for this task" unless="matrix-versions"/>
      <fail message="Set -Djdk16= to a JDK1.6 installation" unless="HAVE_JDK_1.6"/>
      
@@ -3847,7 +3846,8 @@
      <test-compatibility client-version="5_0_0_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
      <test-compatibility client-version="5_0_1_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
      <test-compatibility client-version="5_0_x" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
-     <test-compatibility client-version="5_1_x" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+     <test-compatibility client-version="5_1_0_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+     <test-compatibility client-version="5_2_x" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
      <test-compatibility client-version="6_0_x" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
      <!-- testing interoperating with clients using the pooled invokers -->
      <test-compatibility-pooled-invokers label="16c-16s" client-version="4_2_3_GA" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
@@ -3855,7 +3855,8 @@
      <test-compatibility-pooled-invokers label="16c-16s" client-version="5_0_0_GA" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
      <test-compatibility-pooled-invokers label="16c-16s" client-version="5_0_1_GA" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
      <test-compatibility-pooled-invokers label="16c-16s" client-version="5_0_x" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
-     <test-compatibility-pooled-invokers label="16c-16s" client-version="5_1_x" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+     <test-compatibility-pooled-invokers label="16c-16s" client-version="5_1_0_GA" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+     <test-compatibility-pooled-invokers label="16c-16s" client-version="5_2_x" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
      <test-compatibility-pooled-invokers label="16c-16s" client-version="6_0_x" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
    </target>
  

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2009-09-20 02:12:58 UTC (rev 93785)
+++ trunk/testsuite/imports/server-config.xml	2009-09-20 02:24:50 UTC (rev 93786)
@@ -972,6 +972,8 @@
             </classpath>
             <jvmarg line="${jpda.cmdline}" />
             <jvmarg line="@{jvmargs}" />
+     	    <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+            <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
             <arg value="-c"/>
             <arg value="@{conf}"/>
             <arg value="-b"/>
@@ -997,6 +999,13 @@
             <classpath>
                <pathelement location="@{jboss.dist}/bin/shutdown.jar"/>
                <pathelement location="@{jboss.dist}/client/jbossall-client.jar"/>
+	       <!-- JBAS-7132 -->
+               <pathelement location="@{jboss.dist}/lib/jboss-bootstrap-spi-as.jar"/>
+               <pathelement location="@{jboss.dist}/lib/jboss-bootstrap-spi.jar"/>
+               <pathelement location="@{jboss.dist}/lib/jboss-bootstrap-spi-mc.jar"/>
+               <pathelement location="@{jboss.dist}/lib/jboss-kernel.jar"/>
+               <pathelement location="@{jboss.dist}/lib/jboss-system.jar"/>
+               <pathelement location="@{jboss.dist}/lib/jboss-system-jmx.jar"/>
             </classpath>
             <arg value="--server"/>
             <arg value="@{url}"/>