[jboss-cvs] JBossAS SVN: r99530 - in trunk/testsuite: src/resources/jbossts/scripts and 1 other directory.

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

Author: istudens at redhat.com
Date: 2010-01-18 03:42:36 -0500 (Mon, 18 Jan 2010)
New Revision: 99530

Modified:
   trunk/testsuite/imports/config/tests-jts-propagation.xml
   trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml
Log:
client transaction param indicated in test name, JBQA-2604

Modified: trunk/testsuite/imports/config/tests-jts-propagation.xml
===================================================================
--- trunk/testsuite/imports/config/tests-jts-propagation.xml	2010-01-18 07:56:35 UTC (rev 99529)
+++ trunk/testsuite/imports/config/tests-jts-propagation.xml	2010-01-18 08:42:36 UTC (rev 99530)
@@ -23,7 +23,7 @@
     |    ./build.sh tests-jts-propagation
     |     
     |  or for particular test scenario:
-    |    ./build.sh -Djbossts.ejbX={ejb2|ejb3} -Djbossts.transport={jrmp|iiop} -Djbossts.target=jts-propagation-tests-single tests-jts-propagation
+    |    ./build.sh -Djbossts.ejbX={ejb2|ejb3} -Djbossts.transport={jrmp|iiop} -Djbossts.clientTx={false|true} -Djbossts.target=jts-propagation-tests-single tests-jts-propagation
     |
     | Note: If you want to force the wiping out any txs in doubt from DB before the test you can use the property -DwipeOutTxsInDoubtBeforeTest=true. 
     | Note 2: The default database is PostgreSQL 8.3. To change this you need to set the property jbossts.db like for the crash recovery tests. 

Modified: trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml
===================================================================
--- trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml	2010-01-18 07:56:35 UTC (rev 99529)
+++ trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml	2010-01-18 08:42:36 UTC (rev 99530)
@@ -635,14 +635,18 @@
   </target>
 	
   <target name="jts-propagation-tests-batch">
+  	
+      <condition property="test.name.clientTx" value="clientTx-" else="">
+        <istrue value="${jbossts.clientTx}"/>
+      </condition>
       <condition property="test.name.ejbX" value="ejb3" else="ejb2">
         <istrue value="${ejb3}"/>
       </condition>
       <condition property="test.name.transport" value="iiop" else="jrmp">
         <istrue value="${ots}"/>
       </condition>
-      <property name="testname.prefix" value="${test.name.ejbX}-${test.name.transport}"/>
-   
+      <property name="testname.prefix" value="${test.name.clientTx}${test.name.ejbX}-${test.name.transport}"/>
+
       <!-- batch of jts propagation test scenarios -->
       <run-jts-propagation-test specs0="none" specs1="none" rollbackExpected="false" />
       <run-jts-propagation-test specs0="none" specs1="pre_prepare_rollbackonly" rollbackExpected="true" />