[jboss-svn-commits] JBL Code SVN: r29432 - labs/jbosstm/trunk/qa.

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

Author: jhalliday
Date: 2009-09-22 06:23:56 -0400 (Tue, 22 Sep 2009)
New Revision: 29432

Modified:
   labs/jbosstm/trunk/qa/TaskImpl.properties
   labs/jbosstm/trunk/qa/run-tests.xml
Log:
Test config changes. JBTM-390


Modified: labs/jbosstm/trunk/qa/TaskImpl.properties
===================================================================
--- labs/jbosstm/trunk/qa/TaskImpl.properties	2009-09-22 10:21:14 UTC (rev 29431)
+++ labs/jbosstm/trunk/qa/TaskImpl.properties	2009-09-22 10:23:56 UTC (rev 29432)
@@ -18,7 +18,7 @@
 COMMAND_LINE_0=/qa/tools/opt/jdk1.6.0_11/bin/java
 # use this form to inherit the java version used by ant:
 #COMMAND_LINE_0=${java.home}${file.separator}bin${file.separator}java
-#COMMAND_LINE_0=/usr/local/jdk1.6.0_14/bin/java
+#COMMAND_LINE_0=/usr/local/jdk1.6.0_16/bin/java
 #
 COMMAND_LINE_1=-classpath
 #
@@ -30,12 +30,12 @@
 # file we use command line override of some properties.
 #
 COMMAND_LINE_2=\
-  ..${file.separator}install${file.separator}lib${file.separator}jbossjts.jar\
+  ..${file.separator}install${file.separator}etc${file.separator}\
+  ${path.separator}..${file.separator}install${file.separator}lib${file.separator}jbossjts.jar\
   ${path.separator}..${file.separator}install${file.separator}lib${file.separator}ext${file.separator}jta-1_1-classes.zip\
   ${path.separator}..${file.separator}install${file.separator}lib${file.separator}ext${file.separator}connector-api.jar\
   ${path.separator}..${file.separator}install${file.separator}lib${file.separator}ext${file.separator}commons-logging-1.1.jar\
   ${path.separator}..${file.separator}install${file.separator}lib${file.separator}ext${file.separator}log4j-1.2.14.jar\
-  ${path.separator}..${file.separator}install${file.separator}etc${file.separator}\
   ${path.separator}..${file.separator}install${file.separator}jacorb${file.separator}lib${file.separator}idl.jar\
   ${path.separator}..${file.separator}install${file.separator}jacorb${file.separator}lib${file.separator}backport-util-concurrent.jar\
   ${path.separator}..${file.separator}install${file.separator}jacorb${file.separator}lib${file.separator}jacorb.jar\

Modified: labs/jbosstm/trunk/qa/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/qa/run-tests.xml	2009-09-22 10:21:14 UTC (rev 29431)
+++ labs/jbosstm/trunk/qa/run-tests.xml	2009-09-22 10:23:56 UTC (rev 29432)
@@ -42,6 +42,8 @@
     <!-- handy utility space where you can copy one or more test groups if you want to run something ad-hoc -->
     <target name="scratch">
 
+        <antcall target="junit-tests"><param name="tests" value="jtatests01"/></antcall>
+        
     </target>
 
     <!-- a faster subset of the tests for smoke testing. aim to keep to under one hour total. -->
@@ -63,7 +65,7 @@
         <!-- rawsubtransactionawareresources02_1 : 6 tests, 1 minute -->
         <antcall target="junit-tests"><param name="tests" value="rawsubtransactionawareresources02_1"/></antcall>
 
-        <!-- crashrecovery01 : 24 tests, 6 minutes -->
+        <!-- crashrecovery01 : 24 tests, 3 minutes -->
         <antcall target="junit-tests"><param name="tests" value="crashrecovery01"/></antcall>
         <!-- crashrecovery02_1 : 5 tests, 6 minutes -->
         <antcall target="junit-tests"><param name="tests" value="crashrecovery02_1"/></antcall>
@@ -77,8 +79,7 @@
     </target>
 
     <!-- General tests.
-        Some groups take a really long time and are disabled by default.
-        The remaining tests should take a combined time of around 4hrs or so.
+        These tests should take a combined time of around 4 hrs or so.
     -->
     <target name="junit">
 
@@ -115,26 +116,26 @@
         <!-- rawsubtransactionawareresources02_3 : 25 tests, 3 minutes -->
         <antcall target="junit-tests"><param name="tests" value="rawsubtransactionawareresources02_3"/></antcall>
 
-        <!-- crashrecovery01 : 24 tests, 6 minutes -->
+        <!-- crashrecovery01 : 24 tests, 3 minutes -->
         <antcall target="junit-tests"><param name="tests" value="crashrecovery01"/></antcall>
-        <!-- crashrecovery02_1 : 5 tests, 6 minutes -->
+        <!-- crashrecovery02_1 : 5 tests, 2 minutes -->
         <antcall target="junit-tests"><param name="tests" value="crashrecovery02_1"/></antcall>
-        <!-- crashrecovery02_2 : 50 tests, 60 minutes -->
-        <!-- <antcall target="junit-tests"><param name="tests" value="crashrecovery02_2"/></antcall> -->
+        <!-- crashrecovery02_2 : 50 tests, 12 minutes -->
+        <antcall target="junit-tests"><param name="tests" value="crashrecovery02_2"/></antcall>
         <!-- crashrecovery03 : 1 tests, 1 minute -->
         <antcall target="junit-tests"><param name="tests" value="crashrecovery03"/></antcall>
-        <!-- crashrecovery04 : 48 tests, 11 minutes -->
+        <!-- crashrecovery04 : 48 tests, 6 minutes -->
         <antcall target="junit-tests"><param name="tests" value="crashrecovery04"/></antcall>
-        <!-- crashrecovery05_1 : 10 tests, 12 minutes -->
+        <!-- crashrecovery05_1 : 10 tests, 3 minutes -->
         <antcall target="junit-tests"><param name="tests" value="crashrecovery05_1"/></antcall>
-        <!-- crashrecovery05_2 : 100 tests, 122 minutes -->
-        <!-- <antcall target="junit-tests"><param name="tests" value="crashrecovery05_2"/></antcall> -->
+        <!-- crashrecovery05_2 : 100 tests, 25 minutes -->
+         <antcall target="junit-tests"><param name="tests" value="crashrecovery05_2"/></antcall>
         <!-- crashrecovery06 : 2 tests, 1 minute -->
         <antcall target="junit-tests"><param name="tests" value="crashrecovery06"/></antcall>
         <!-- crashrecovery07 : 16 tests, 12 minutes -->
         <antcall target="junit-tests"><param name="tests" value="crashrecovery07"/></antcall>
         <!-- crashrecovery08 : 32 tests, 32 minutes -->
-        <!-- <antcall target="junit-tests"><param name="tests" value="crashrecovery08"/></antcall> -->
+         <antcall target="junit-tests"><param name="tests" value="crashrecovery08"/></antcall>
         <!-- crashrecovery09 : 6 tests, 7 minutes -->
         <antcall target="junit-tests"><param name="tests" value="crashrecovery09"/></antcall>
         <!-- crashrecovery10 : 6 tests, 7 minutes -->
@@ -144,13 +145,6 @@
 
     </target>
 
-    <!-- long running crash rec test groups (the ones disabled in the 'junit' target) -->
-    <target name="junit-longer">
-        <antcall target="junit-tests"><param name="tests" value="crashrecovery02_2"/></antcall>
-        <antcall target="junit-tests"><param name="tests" value="crashrecovery05_2"/></antcall>
-        <antcall target="junit-tests"><param name="tests" value="crashrecovery08"/></antcall>
-    </target>
-
     <!-- copy the selected db driver out of the available set into the classpath.
         See also build.xml get.drivers and TaskImpl.properties for classpath
      -->