[jboss-svn-commits] JBL Code SVN: r26691 - in labs/jbosstm/trunk: qa/tests/scripts and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri May 22 07:47:33 EDT 2009
Author: istudens at redhat.com
Date: 2009-05-22 07:47:33 -0400 (Fri, 22 May 2009)
New Revision: 26691
Modified:
labs/jbosstm/trunk/build-release-pkgs.xml
labs/jbosstm/trunk/qa/tests/scripts/as-tests.xml
labs/jbosstm/trunk/qa/tests/scripts/imports/test-config.xml
Log:
changes for integration of as-tests with JBossAS testsuite, JBQA-2176
Modified: labs/jbosstm/trunk/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/trunk/build-release-pkgs.xml 2009-05-22 11:04:30 UTC (rev 26690)
+++ labs/jbosstm/trunk/build-release-pkgs.xml 2009-05-22 11:47:33 UTC (rev 26691)
@@ -124,6 +124,13 @@
<delete file="${workdir}/jbossts-jta-${filename}.zip"/>
<zip basedir="${workdir}/build/${tag}" destfile="${workdir}/jbossts-jta-${filename}.zip"
includes="${tag}/**"/>
+
+ <!-- build and package as-tests -->
+ <ant dir="${workdir}/build/${tag}/qa" antfile="build.xml" />
+ <zip destfile="${workdir}/jbossts-as-tests.zip">
+ <fileset file="${workdir}/build/${tag}/qa/build/qa/lib/astest.jar" />
+ <fileset dir="${workdir}/build/${tag}/qa/build/qa" includes="scripts/**,resources/java.policy" />
+ </zip>
<!-- build the full release (assumes XTS builds against JTS) -->
<delete dir="${workdir}/build"/>
@@ -249,6 +256,18 @@
<arg value="-DgeneratePom=true"/>
</exec>
+ <exec executable="mvn" dir="${workdir}">
+ <arg value="deploy:deploy-file"/>
+ <arg value="-Dfile=${workdir}/build/${tag}/bin/jbossts-as-tests.zip"/>
+ <arg value="-Dpackaging=zip"/>
+ <arg value="-Durl=${mvn.url}"/>
+ <arg value="-DrepositoryId=${mvn.repositoryId}"/>
+ <arg value="-DgroupId=jboss.jbossts"/>
+ <arg value="-DartifactId=jbossts-as-tests"/>
+ <arg value="-Dversion=${filename}"/>
+ <arg value="-DgeneratePom=true"/>
+ </exec>
+
<!-- the resources part appears to require a bit of a kludge: -->
<!-- add to the same dir as the previously cached jta properties file, then jar up -->
<copy file="${workdir}/build/${tag}/etc/jbossts-properties.xml"
Modified: labs/jbosstm/trunk/qa/tests/scripts/as-tests.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/scripts/as-tests.xml 2009-05-22 11:04:30 UTC (rev 26690)
+++ labs/jbosstm/trunk/qa/tests/scripts/as-tests.xml 2009-05-22 11:47:33 UTC (rev 26691)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="JBoss" default="help" basedir="."
+<project name="jbossts-as-tests" default="help" basedir="."
xmlns:astest="http://jboss.org/ns/test/ant/astest">
<property environment="env"/>
@@ -8,12 +8,23 @@
<property name="jboss.server.config" value="default"/>
<property name="product.dir" value="${env.DTF_HOME}/JBossTS-JTA-QA/"/>
+ <property name="jbossts.common.jar.dir" value="${product.dir}/lib/ext"/>
+ <property name="astest.jar.dir" value="${product.dir}/qa/lib"/>
+ <property name="astest.jar.deploy.dir" value="qa/lib/"/>
+ <property name="jboss.server.manager.jar.dir" value="${product.dir}/qa/lib"/>
+ <property name="jboss.server.manager.jar.name" value="jboss-server-manager-0.1.1.GA.jar"/>
+
<path id="astest.taskdef.classpath">
<pathelement location="${jboss.home}/client/jbossall-client.jar"/>
<pathelement location="${jboss.home}/client/log4j.jar" />
- <pathelement location="${jboss.home}/lib/jboss-aop-jdk50.jar"/>
+ <pathelement location="${jboss.home}/client/jboss-logging-spi.jar" />
<pathelement location="${jboss.home}/lib/trove.jar"/>
+ <pathelement location="${jbossts.common.jar.dir}/jbossts-common.jar"/>
+ <pathelement location="${astest.jar.dir}/astest.jar"/>
+ <pathelement location="${jboss.server.manager.jar.dir}/${jboss.server.manager.jar.name}"/>
+
+ <!-- FIXME Does DTF need this fileset? If not it is needless. -->
<fileset dir="${product.dir}">
<include name="lib/*.jar"/>
<include name="lib/ext/*.jar"/>
@@ -53,7 +64,7 @@
and deploy one artifact
-->
<astest:server method="start" serverName="default" >
- <deploy from="qa/lib/astest.jar" to="deploy/astest.jar" />
+ <deploy from="${astest.jar.deploy.dir}astest.jar" to="deploy/astest.jar" />
</astest:server>
<!--
wait 10000 ms and then execute an action (TODO implement a method of detecting when the
@@ -74,7 +85,7 @@
<target name="test5">
<astest:server method="start" serverName="default" >
- <deploy from="qa/lib/astest.jar" to="deploy/astest.jar" />
+ <deploy from="${astest.jar.deploy.dir}astest.jar" to="deploy/astest.jar" />
</astest:server>
<astest:action waitFor="10000" impl="org.jboss.jbossts.qa.astests.ASCrashRecovery01.Test03">
<param key="name" value="test05" />
@@ -90,7 +101,7 @@
<target name="test6">
<astest:server method="start" serverName="default" >
- <deploy from="qa/lib/astest.jar" to="deploy/astest.jar" />
+ <deploy from="${astest.jar.deploy.dir}astest.jar" to="deploy/astest.jar" />
</astest:server>
<astest:action waitFor="10000" impl="org.jboss.jbossts.qa.astests.ASCrashRecovery01.Test03">
<param key="name" value="test06" />
@@ -116,7 +127,7 @@
-->
<target name="testjta">
<astest:server method="deploy" serverName="jta" waitFor="10000">
- <deploy from="qa/lib/astest.jar" to="deploy/astest.jar" />
+ <deploy from="${astest.jar.deploy.dir}astest.jar" to="deploy/astest.jar" />
</astest:server>
<parallel>
<astest:action abortOnFail="false" impl="org.jboss.jbossts.qa.astests.ASCrashRecovery01.Test03">
@@ -138,7 +149,7 @@
<target name="testjts">
<astest:server method="deploy" serverName="jts" waitFor="10000">
- <deploy from="qa/lib/astest.jar" to="deploy/astest.jar" />
+ <deploy from="${astest.jar.deploy.dir}astest.jar" to="deploy/astest.jar" />
</astest:server>
<parallel>
<astest:action abortOnFail="false" impl="org.jboss.jbossts.qa.astests.ASCrashRecovery01.Test03">
@@ -162,4 +173,58 @@
</astest:server>
</target>
+
+ <!--
+ Tests intended for JBossAS Testsuite optional task
+ -->
+ <target name="as-tests" depends="as-tests-jta, as-tests-jts" />
+
+ <target name="as-tests-jta">
+ <astest:server method="start" serverName="crashrecovery-jta" >
+ <deploy from="${astest.jar.deploy.dir}astest.jar" to="deploy/astest.jar" />
+ </astest:server>
+ <parallel>
+ <astest:action abortOnFail="false" impl="org.jboss.jbossts.qa.astests.ASCrashRecovery01.Test03">
+ <param key="specs" value="sync_before,sync_after,none,pre_prepare_suspend" />
+ </astest:action>
+ <astest:action abortOnFail="false" impl="org.jboss.jbossts.qa.astests.ASCrashRecovery01.Test03">
+ <param key="name" value="testjta" />
+ <param key="specs" value="none,none,none,commit_ex,commit_ex" />
+ <param key="serverName" value="crashrecovery-jta" />
+ </astest:action>
+ <astest:action abortOnFail="false" impl="org.jboss.jbossts.qa.astests.ASCrashRecovery01.Test03">
+ <param key="specs" value="sync_before,sync_after,none,pre_prepare_suspend" />
+ </astest:action>
+ </parallel>
+ <astest:server method="stop" serverName="crashrecovery-jta" >
+ <undeploy from="deploy/astest.jar" />
+ </astest:server>
+ </target>
+
+ <target name="as-tests-jts">
+ <astest:server method="start" serverName="crashrecovery-jts" >
+ <deploy from="${astest.jar.deploy.dir}astest.jar" to="deploy/astest.jar" />
+ </astest:server>
+ <parallel>
+ <astest:action abortOnFail="false" impl="org.jboss.jbossts.qa.astests.ASCrashRecovery01.Test03">
+ <param key="name" value="testjts" />
+ <param key="specs" value="none,none,none,commit_ex,commit_ex" />
+ <param key="serverName" value="crashrecovery-jts" />
+ </astest:action>
+ <astest:action abortOnFail="false" impl="org.jboss.jbossts.qa.astests.ASCrashRecovery01.Test03">
+ <param key="specs" value="sync_before,sync_after,none,pre_prepare_suspend" />
+ <param key="serverName" value="crashrecovery-jts" />
+ </astest:action>
+ <astest:action abortOnFail="false" impl="org.jboss.jbossts.qa.astests.ASCrashRecovery01.Test03">
+ <param key="specs" value="sync_before,sync_after,none,pre_prepare_suspend" />
+ </astest:action>
+ <astest:action abortOnFail="false" impl="org.jboss.jbossts.qa.astests.ASCrashRecovery01.Test03">
+ <param key="specs" value="sync_before,sync_after,none,pre_prepare_suspend" />
+ </astest:action>
+ </parallel>
+ <astest:server method="stop" serverName="crashrecovery-jts" >
+ <undeploy from="deploy/astest.jar" />
+ </astest:server>
+ </target>
+
</project>
Modified: labs/jbosstm/trunk/qa/tests/scripts/imports/test-config.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/scripts/imports/test-config.xml 2009-05-22 11:04:30 UTC (rev 26690)
+++ labs/jbosstm/trunk/qa/tests/scripts/imports/test-config.xml 2009-05-22 11:47:33 UTC (rev 26691)
@@ -1,4 +1,4 @@
-<project name="server-config" default="help"
+<project name="as-tests-server-config" default="help"
xmlns:astest="http://jboss.org/ns/test/ant/astest">
<taskdef name="config" classname="org.jboss.jbossts.qa.astests.taskdefs.ASTestConfig"
@@ -81,8 +81,38 @@
<sysproperty key="org.jboss.resolver.warning" value="true" />
<sysproperty key="sun.rmi.dgc.client.gcInterval" value="3600000" />
<sysproperty key="sun.rmi.dgc.server.gcInterval" value="3600000" />
+ <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
<sysproperty key="server.binding.name" value="ports-02" />
<sysproperty key="server.binding.location" value="qa/resources/sample-bindings.xml" />
</server>
+
+
+ <!--
+ Profiles for JBossAS Testsuite integration
+ -->
+ <server name="crashrecovery-jta" host="${node0}">
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx512m" />
+ <jvmarg value="-XX:MaxPermSize=512m" />
+ <jvmarg value="-server" />
+ <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="org.jboss.resolver.warning" value="true" />
+ <sysproperty key="sun.rmi.dgc.client.gcInterval" value="3600000" />
+ <sysproperty key="sun.rmi.dgc.server.gcInterval" value="3600000" />
+ <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+ </server>
+
+ <server name="crashrecovery-jts" host="${node0}">
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx512m" />
+ <jvmarg value="-XX:MaxPermSize=512m" />
+ <jvmarg value="-server" />
+ <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="org.jboss.resolver.warning" value="true" />
+ <sysproperty key="sun.rmi.dgc.client.gcInterval" value="3600000" />
+ <sysproperty key="sun.rmi.dgc.server.gcInterval" value="3600000" />
+ <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+ </server>
+
</astest:config>
</project>
More information about the jboss-svn-commits
mailing list