[jboss-cvs] tools/etc/cruisecontrol/scripts ...
Rali Genova
rgenova at jboss.org
Tue Jul 25 16:05:07 EDT 2006
User: rgenova
Date: 06/07/25 16:05:06
Modified: etc/cruisecontrol/scripts build-jboss-portal.xml
Log:
updated portal testsuite script to reflect changes in the portal modules
Revision Changes Path
1.29 +18 -156 tools/etc/cruisecontrol/scripts/build-jboss-portal.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build-jboss-portal.xml
===================================================================
RCS file: /cvsroot/jboss/tools/etc/cruisecontrol/scripts/build-jboss-portal.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- build-jboss-portal.xml 10 Jul 2006 21:42:02 -0000 1.28
+++ build-jboss-portal.xml 25 Jul 2006 20:05:05 -0000 1.29
@@ -44,22 +44,18 @@
<target name="runtestsuite" description="Deploys Portal on different JBoss homes and runs the testsuite">
<mkdir dir="${log.dir}/results"/>
- <antcall target="runtests">
+ <!-- <antcall target="runtests">
<param name="jboss.home.dir" value="../checkout/jboss-builds/jboss-4.0.x/jboss-4.0.5.CR1"/>
<param name="jboss.version.info" value="4_0_x"/>
- </antcall>
+ </antcall> -->
<antcall target="runtests">
<param name="jboss.home.dir" value="../../jboss-4.0.4.GA"/>
<param name="jboss.version.info" value="4_0_4_GA"/>
</antcall>
- <antcall target="runtests">
- <param name="jboss.home.dir" value="../../jboss-4.0.3SP1"/>
- <param name="jboss.version.info" value="4_0_3SP1"/>
- </antcall>
- <antcall target="runtests">
+ <!--<antcall target="runtests">
<param name="jboss.home.dir" value="../checkout/jboss-builds/jboss-head/jboss-5.0.0.Beta"/>
<param name="jboss.version.info" value="HEAD"/>
- </antcall>
+ </antcall>-->
</target>
@@ -71,11 +67,9 @@
<antcall target="build">
<param name="jboss.version" value="${jboss.version.info}"/>
</antcall>
- <!--<deploy jboss.home="${jboss.home.dir}" jboss.version="${jboss.version.info}"/>-->
- <jboss.start jboss.home="${jboss.home.dir}"/>
<tests jboss.home="${jboss.home.dir}" jboss.version="${jboss.version.info}"/>
- <jboss.shutdown jboss.home="${jboss.home.dir}"/>
<copylogs jboss.home="${jboss.home.dir}" jboss.version="${jboss.version.info}"/>
+ <antcall target="copyresults"/>
</target>
@@ -83,6 +77,9 @@
<exec executable="ant" failonerror="true" output="${log.dir}/${jboss.version}-logs/clean.log">
<arg line=" -buildfile ../checkout/${jboss.dir}/build/build.xml clean"/>
</exec>
+ <exec executable="ant" failonerror="true" append="true" output="${log.dir}/${jboss.version}-logs/clean.log">
+ <arg line=" -buildfile ../checkout/${jboss.dir}/testsuite/build.xml clean"/>
+ </exec>
</target>
<target name="build">
@@ -93,161 +90,27 @@
<exec executable="ant" failonerror="true" output="${log.dir}/${jboss.version}-logs/compile.log" append="true">
<arg line=" -buildfile ../checkout/${jboss.dir}/test/build.xml"/>
</exec>
- <antcall target="copylogs">
- <param name="dest.dir" value="${log.dir}"/>
- <param name="proj.dir" value="${jboss.dir}"/>
- </antcall>
</sequential>
</target>
- <!--
- <macrodef name="deploy">
- <attribute name="jboss.home" default=""/>
- <attribute name="jboss.version" default=""/>
- <sequential>
- <echo message="@{jboss.home}"/>
- <echo message="@{jboss.version}"/>
- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/deploy.log" failonerror="false" resultproperty="@{jboss.version}.deploy.returncode" append="true">
- <arg line=" -buildfile ../checkout/${jboss.dir}/test/build.xml deploy"/>
- <env key="JBOSS_HOME" path="@{jboss.home}"/>
- <env key="PATH" path="@{jboss.home}/bin:${env.PATH}"/>
- </exec>
- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/deploy.log" failonerror="true" append="true">
- <arg line=" -buildfile ../checkout/${jboss.dir}/server/build.xml deploy"/>
- <env key="JBOSS_HOME" path="@{jboss.home}"/>
- <env key="PATH" path="@{jboss.home}/bin:${env.PATH}"/>
- </exec>
- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/deploy.log" failonerror="true" append="true">
- <arg line=" -buildfile ../checkout/${jboss.dir}/portlet/build.xml deploy-test"/>
- <env key="JBOSS_HOME" path="@{jboss.home}"/>
- <env key="PATH" path="@{jboss.home}/bin:${env.PATH}"/>
- </exec>
- <condition property="@{jboss.version}.deploy.success">
- <equals arg1="${@{jboss.version}.deploy.returncode}" arg2="0"/>
- </condition>
- <fail unless="@{jboss.version}.deploy.success">
- Exit code: ${@{jboss.version}.deploy.returncode}
- See deploy.log under @{jboss.version}-logs folder in Build Artifacts for details.
- </fail>
- </sequential>
- </macrodef>
- -->
-
- <macrodef name="jboss.start">
- <attribute name="jboss.home" default=""/>
- <sequential>
- <java classname="org.jboss.Main" fork="true" spawn="true">
- <arg line="-c default -b localhost"/>
- <jvmarg value="-Xms32m"/>
- <jvmarg value="-Xmx200m"/>
- <sysproperty key="java.endorsed.dirs" value="@{jboss.home}/lib/endorsed"/>
- <classpath>
- <pathelement path="@{jboss.home}/bin/run.jar"/>
- <pathelement path="@{java.home}/lib/tools.jar"/>
- </classpath>
- </java>
- </sequential>
- </macrodef>
-
<macrodef name="tests">
<attribute name="jboss.home" default=""/>
<attribute name="jboss.version" default=""/>
<sequential>
<exec executable="ant" output="${log.dir}/@{jboss.version}-logs/tests.log" append="true">
- <arg line=" -buildfile ../checkout/${jboss.dir}/common/build.xml -Djboss-junit-configuration=@{jboss.version} test"/>
- <env key="JBOSS_HOME" path="@{jboss.home}"/>
- </exec>
- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/tests.log" append="true">
- <arg line=" -buildfile ../checkout/${jboss.dir}/format/build.xml -Djboss-junit-configuration=@{jboss.version} test"/>
- <env key="JBOSS_HOME" path="@{jboss.home}"/>
- </exec>
-
- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/deploy.log" failonerror="false" resultproperty="@{jboss.version}.deploy.returncode" append="true">
- <arg line=" -buildfile ../checkout/${jboss.dir}/test/build.xml deploy"/>
- <env key="JBOSS_HOME" path="@{jboss.home}"/>
- <env key="PATH" path="@{jboss.home}/bin:${env.PATH}"/>
- </exec>
- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/tests.log" append="true">
- <arg line=" -buildfile ../checkout/${jboss.dir}/server/build.xml -Djboss-junit-configuration=@{jboss.version} test"/>
- <env key="JBOSS_HOME" path="@{jboss.home}"/>
- </exec>
-
- <!-- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/deploy.log" failonerror="true" append="true">
- <arg line=" -buildfile ../checkout/${jboss.dir}/server/build.xml deploy"/>
- <env key="JBOSS_HOME" path="@{jboss.home}"/>
- <env key="PATH" path="@{jboss.home}/bin:${env.PATH}"/>
- </exec> -->
- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/deploy.log" failonerror="true" append="true">
- <arg line=" -buildfile ../checkout/${jboss.dir}/portlet/build.xml deploy-test"/>
- <env key="JBOSS_HOME" path="@{jboss.home}"/>
- <env key="PATH" path="@{jboss.home}/bin:${env.PATH}"/>
- </exec>
- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/tests.log" append="true">
- <arg line=" -buildfile ../checkout/${jboss.dir}/portlet/build.xml -Djboss-junit-configuration=@{jboss.version} test"/>
- <env key="JBOSS_HOME" path="@{jboss.home}"/>
- </exec>
- <!-- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/deploy.log" failonerror="true" append="true">
- <arg line=" -buildfile ../checkout/${jboss.dir}/server/build.xml undeploy"/>
- <env key="JBOSS_HOME" path="@{jboss.home}"/>
- <env key="PATH" path="@{jboss.home}/bin:${env.PATH}"/>
- </exec> -->
- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/deploy.log" failonerror="true" append="true">
- <arg line=" -buildfile ../checkout/${jboss.dir}/portlet/build.xml undeploy-test"/>
+ <arg line=" -buildfile ../checkout/${jboss.dir}/testsuite/build.xml -Djboss-junit-configuration=@{jboss.version} tests"/>
+ <env key="PATH" path="/opt/apache-ant-1.6.5/bin:${env.PATH}"/>
<env key="JBOSS_HOME" path="@{jboss.home}"/>
- <env key="PATH" path="@{jboss.home}/bin:${env.PATH}"/>
+ <env key="ANT_HOME" path="/opt/apache-ant-1.6.5"/>
</exec>
- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/deploy.log" failonerror="true" append="true">
- <arg line=" -buildfile ../checkout/${jboss.dir}/test/build.xml undeploy"/>
- <env key="JBOSS_HOME" path="@{jboss.home}"/>
- <env key="PATH" path="@{jboss.home}/bin:${env.PATH}"/>
- </exec>
- </sequential>
- </macrodef>
-
- <macrodef name="jboss.shutdown">
- <attribute name="jboss.home" default=""/>
- <sequential>
- <java dir="@{jboss.home}/server/default/conf" classname="org.jboss.Shutdown" fork="true">
- <arg line="--server=jnp://${jboss.host}:1099 --shutdown"/>
- <classpath>
- <pathelement path="@{jboss.home}/bin/shutdown.jar"/>
- </classpath>
- </java>
</sequential>
</macrodef>
- <target name="generatereports">
- <sequential>
- <delete dir="../checkout/${jboss.dir}/build/reports"/>
- <mkdir dir="../checkout/${jboss.dir}/build/reports"/>
-
- <junitreport todir="../checkout/${jboss.dir}/build/reports">
- <fileset dir="../checkout/${jboss.dir}/common/">
- <include name="TEST-*.xml"/>
- </fileset>
- <fileset dir="../checkout/${jboss.dir}/format/">
- <include name="TEST-*.xml"/>
- </fileset>
- <fileset dir="../checkout/${jboss.dir}/portlet/">
- <include name="TEST-*.xml"/>
- </fileset>
- <fileset dir="../checkout/${jboss.dir}/server/">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames"
- todir="../checkout/${jboss.dir}/build/reports"/>
- </junitreport>
- </sequential>
- </target>
-
- <target name="copyresults" depends="generatereports">
+ <target name="copyresults">
<sequential>
<mkdir dir="${log.dir}/results"/>
- <copy todir="${log.dir}/results">
- <fileset dir="../checkout/${jboss.dir}/build/reports"/>
- </copy>
<copy todir="${log.dir}/results" flatten="true">
- <fileset dir="../checkout/${jboss.dir}/" includes="**/TEST-*.xml"/>
+ <fileset dir="../checkout/${jboss.dir}/testsuite/output/reports"/>
</copy>
<antcall target="test-build-failure">
<param name="fileset.dir" value="${log.dir}/results"/>
@@ -266,9 +129,8 @@
<fileset dir="@{jboss.home}/server/default/" includes="log/*.log"/>
</copy>
<copy todir="${log.dir}/@{jboss.version}-logs">
- <fileset dir="../checkout/${jboss.dir}/" includes="server/**/*.log,build/**/*.log"/>
+ <fileset dir="../checkout/${jboss.dir}/testsuite/output/logs"/>
</copy>
</sequential>
</macrodef>
</project>
-
More information about the jboss-cvs-commits
mailing list