[jboss-svn-commits] JBL Code SVN: r30313 - in labs/jbosstm/trunk/qa: tests and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 23 09:53:34 EST 2009
Author: jhalliday
Date: 2009-11-23 09:53:34 -0500 (Mon, 23 Nov 2009)
New Revision: 30313
Modified:
labs/jbosstm/trunk/qa/build.xml
labs/jbosstm/trunk/qa/run-tests.xml
labs/jbosstm/trunk/qa/tests/build-jta.xml
labs/jbosstm/trunk/qa/tests/build-jts.xml
Log:
Tidy up and update db driver handling. JBTM-390
Modified: labs/jbosstm/trunk/qa/build.xml
===================================================================
--- labs/jbosstm/trunk/qa/build.xml 2009-11-23 13:55:42 UTC (rev 30312)
+++ labs/jbosstm/trunk/qa/build.xml 2009-11-23 14:53:34 UTC (rev 30313)
@@ -31,57 +31,53 @@
<property name="org.jboss.jbossts.qa.idlcompiler.lib"
location="../ArjunaJTS/orbportability/lib/ext"/>
- <!-- set these to the location(s) of the database drivers -->
+ <!-- you should not need to configure anything below here -->
- <fileset id="oracle.drivers" dir="${driver.home}/oracle_10_2_0_4/">
- <include name="ojdbc14.jar"/>
- </fileset>
+ <property name="driver.url" value="http://reports.qa.atl.jboss.com/jdbc-drivers/"/>
- <fileset id="mssql.drivers" dir="${driver.home}/mssql2005_sqljdbc_2.0/enu/">
- <include name="sqljdbc.jar"/>
- <include name="sqljdbc4.jar"/>
- </fileset>
+ <property name="org.jboss.jbossts.qa.server_manager_location" location="ext/jboss-server-manager-0.1.1.GA.jar"/>
+ <property name="org.jboss.jbossts.qa.dist.buildroot" location="build"/>
- <!-- 8.1.408 is broken, use something more recent. -->
- <fileset id="pgsql.drivers" dir="${driver.home}/">
- <include name="postgresql-8.3-603.jdbc3.jar"/>
- </fileset>
+ <target name="get.drivers">
- <!-- server version 5 is the first with XA support, do use anything less.
- driver versions before 5.0.5 are broken, don't use them either. -->
- <fileset id="mysql.drivers" dir="${driver.home}/">
- <include name="mysql-connector-java-5.1.7-bin.jar"/>
- </fileset>
+ <!--
+ https://docspace.corp.redhat.com/clearspace/docs/DOC-16080
+ http://www.jboss.com/products/platforms/application/supportedconfigurations/
+ Files names below should be matched to those in run-tests.xml
+ https://wiki.corp.redhat.com/bin/view/JBossIT/SystemServiceQaLab#Databases
+ server connection params in config/jdbc_profiles/
+ TODO: update DB2, Sybase servers
+ -->
- <fileset id="ibmdb2.drivers" dir="${driver.home}/DB2_v9/">
- <include name="db2jcc*.jar"/>
- </fileset>
+ <mkdir dir="${driver.home}/oracle_10_2_0_4"/>
+ <get src="${driver.url}/ojdbc14.jar"
+ dest="${driver.home}/oracle_10_2_0_4/ojdbc14.jar"/>
- <fileset id="sybase.drivers" dir="${driver.home}/jConnect-6_0/classes/">
- <include name="jconn3.jar"/>
- </fileset>
+ <mkdir dir="${driver.home}/mssql2005_sqljdbc_2.0/enu"/>
+ <get src="${driver.url}/sqljdbc_2.0/enu/sqljdbc.jar"
+ dest="${driver.home}/mssql2005_sqljdbc_2.0/enu/sqljdbc.jar"/>
+ <get src="${driver.url}/sqljdbc_2.0/enu/sqljdbc4.jar"
+ dest="${driver.home}/mssql2005_sqljdbc_2.0/enu/sqljdbc4.jar"/>
- <!-- you should not need to configure anything below here -->
+ <!-- pgsql 8.1.408 is broken, use something more recent. -->
+ <get src="${driver.url}/postgresql-8.3-605.jdbc4.jar"
+ dest="${driver.home}/postgresql-8.3-605.jdbc4.jar"/>
- <property name="driver.url" value="http://reports.qa.atl.jboss.com/jdbc-drivers/"/>
+ <!-- mysql server version 5 is the first with XA support, do use anything less.
+ driver versions before 5.0.5 are broken, don't use them either. -->
+ <get src="${driver.url}/mysql-connector-java-5.1.8-bin.jar"
+ dest="${driver.home}/mysql-connector-java-5.1.8-bin.jar"/>
- <property name="org.jboss.jbossts.qa.server_manager_location" location="ext/jboss-server-manager-0.1.1.GA.jar"/>
- <property name="org.jboss.jbossts.qa.dist.buildroot" location="build"/>
+ <mkdir dir="${driver.home}/DB2_v9.7"/>
+ <get src="${driver.url}/DB2_v9.7/db2jcc.jar"
+ dest="${driver.home}/DB2_v9.7/db2jcc.jar"/>
+ <get src="${driver.url}/DB2_v9.7/db2jcc_license_cu.jar"
+ dest="${driver.home}/DB2_v9.7/db2jcc_license_cu.jar"/>
- <path id="database.drivers.path">
- <fileset refid="oracle.drivers"/>
- <fileset refid="mssql.drivers"/>
- <fileset refid="pgsql.drivers"/>
- <fileset refid="mysql.drivers"/>
- <fileset refid="ibmdb2.drivers"/>
- <fileset refid="sybase.drivers"/>
- </path>
+ <mkdir dir="${driver.home}/jConnect-6_0/classes"/>
+ <get src="${driver.url}/jConnect-6_0/classes/jconn3.jar"
+ dest="${driver.home}/jConnect-6_0/classes/jconn3.jar"/>
- <target name="get.drivers">
-
- <get src="http://jdbc.postgresql.org/download/postgresql-8.3-604.jdbc3.jar"
- dest="${driver.home}/postgresql-8.3-603.jdbc3.jar"/>
-
</target>
@@ -133,7 +129,6 @@
<!-- build the test suite -->
<ant dir="tests" antfile="build-${buildtype}.xml">
- <reference refid="database.drivers.path"/>
<property name="org.jboss.jbossts.qa.server_manager_location"
value="${org.jboss.jbossts.qa.server_manager_location}"/>
</ant>
Modified: labs/jbosstm/trunk/qa/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/qa/run-tests.xml 2009-11-23 13:55:42 UTC (rev 30312)
+++ labs/jbosstm/trunk/qa/run-tests.xml 2009-11-23 14:53:34 UTC (rev 30313)
@@ -42,11 +42,11 @@
<!-- handy utility space where you can copy one or more test groups if you want to run something ad-hoc -->
<target name="scratch">
- <!-- txcore_recovery : 36 tests, 18 minutes, 12 fails, sleeps too long - need tuning -->
+ <!-- TODO txcore_recovery : 36 tests, 4 minutes, 4 fails (Recovery_Fail_AbstractRecord_Test001-4) -->
<antcall target="junit-tests">
<param name="tests" value="txcore_recovery"/>
- <param name="names" value="Recovery_Crash_LockManager_Test005"/>
- <param name="additional.elements" value="-DCoordinatorEnvironmentBean.writeOptimisation=true"/>
+ <param name="names" value="Recovery_Fail_AbstractRecord_Test00.*"/>
+ <!--<param name="additional.elements" value="-DCoordinatorEnvironmentBean.writeOptimisation=true"/>-->
</antcall>
</target>
@@ -196,15 +196,11 @@
<antcall target="junit-tests"><param name="tests" value="jdbcresources01_mssqlserver_jndi"/></antcall>
<antcall target="junit-tests"><param name="tests" value="jdbcresources02_mssqlserver_jndi"/></antcall>
- <antcall target="install-dbdriver"><param name="files" value="db2*"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources01_ibmdb2_jndi"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources02_ibmdb2_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="postgresql-8.3-603.jdbc3.jar"/></antcall>
+ <antcall target="install-dbdriver"><param name="files" value="postgresql-8.3-605.jdbc3.jar"/></antcall>
<antcall target="junit-tests"><param name="tests" value="jdbcresources01_pgsql_jndi"/></antcall>
<antcall target="junit-tests"><param name="tests" value="jdbcresources02_pgsql_jndi"/></antcall>
- <antcall target="install-dbdriver"><param name="files" value="mysql-connector-java-5.1.7-bin.jar"/></antcall>
+ <antcall target="install-dbdriver"><param name="files" value="mysql-connector-java-5.1.8-bin.jar"/></antcall>
<antcall target="junit-tests"><param name="tests" value="jdbcresources01_mysql_jndi"/></antcall>
<antcall target="junit-tests"><param name="tests" value="jdbcresources02_mysql_jndi"/></antcall>
@@ -212,6 +208,10 @@
<antcall target="junit-tests"><param name="tests" value="jdbcresources01_sybase_jndi"/></antcall>
<antcall target="junit-tests"><param name="tests" value="jdbcresources02_sybase_jndi"/></antcall>
+ <antcall target="install-dbdriver"><param name="files" value="db2*"/></antcall>
+ <antcall target="junit-tests"><param name="tests" value="jdbcresources01_ibmdb2_jndi"/></antcall>
+ <antcall target="junit-tests"><param name="tests" value="jdbcresources02_ibmdb2_jndi"/></antcall>
+
</target>
<!-- the ncl office build server is not on vpn and only a subset of the dbs are available locally -->
Modified: labs/jbosstm/trunk/qa/tests/build-jta.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jta.xml 2009-11-23 13:55:42 UTC (rev 30312)
+++ labs/jbosstm/trunk/qa/tests/build-jta.xml 2009-11-23 14:53:34 UTC (rev 30313)
@@ -29,23 +29,7 @@
<property name="jbossall-client.location" location="${env.JBOSS_HOME}/client/jbossall-client.jar"/>
<property name="astest.dir" value="org/jboss/jbossts/qa/astests"/>
- <!-- set this to the location(s) of the database drivers -->
- <path id="database.drivers.path">
- <fileset dir="/oracle/product/10.2.0/db_1/jdbc/lib/">
- <include name="ojdbc14.jar"/>
- </fileset>
- <fileset dir="/home/jhalli/javastuff/mssql2000jdbc/lib">
- <include name="ms*.jar"/>
- </fileset>
- <fileset id="pgsql.drivers" dir="/home/jhalli/installers/">
- <include name="postgresql-8.1-408.jdbc3.jar"/>
- </fileset>
- <fileset id="mysql.drivers" dir="/home/jhalli/javastuff/mysql-connector-java-5.0.4">
- <include name="mysql-connector-java-5.0.4-bin.jar"/>
- </fileset>
- </path>
-
<property name="org.jboss.jbossts.qa.buildroot" location="build"/>
<property name="org.jboss.jbossts.qa.build.classes" value="${org.jboss.jbossts.qa.buildroot}/classes/"/>
<property name="org.jboss.jbossts.qa.src" location="src"/>
Modified: labs/jbosstm/trunk/qa/tests/build-jts.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jts.xml 2009-11-23 13:55:42 UTC (rev 30312)
+++ labs/jbosstm/trunk/qa/tests/build-jts.xml 2009-11-23 14:53:34 UTC (rev 30313)
@@ -33,22 +33,6 @@
<property name="org.jboss.jbossts.qa.idlcompiler.lib"
location="../../ArjunaJTS/orbportability/lib/ext"/>
- <!-- set this to the location(s) of the database drivers -->
- <path id="database.drivers.path">
- <fileset dir="/oracle/product/10.2.0/db_1/jdbc/lib/">
- <include name="ojdbc14.jar"/>
- </fileset>
- <fileset dir="/home/jhalli/javastuff/mssql2000jdbc/lib">
- <include name="ms*.jar"/>
- </fileset>
- <fileset id="pgsql.drivers" dir="/home/jhalli/installers/">
- <include name="postgresql-8.1-408.jdbc3.jar"/>
- </fileset>
- <fileset id="mysql.drivers" dir="/home/jhalli/javastuff/mysql-connector-java-5.0.4">
- <include name="mysql-connector-java-5.0.4-bin.jar"/>
- </fileset>
- </path>
-
<property name="org.jboss.jbossts.qa.buildroot" location="build"/>
<property name="org.jboss.jbossts.qa.build.classes" value="${org.jboss.jbossts.qa.buildroot}/classes/"/>
<property name="org.jboss.jbossts.qa.build.idl" value="${org.jboss.jbossts.qa.buildroot}/idl/"/>
More information about the jboss-svn-commits
mailing list