Author: jfrederic.clere(a)jboss.com Date: 2012-01-31 11:53:43 -0500 (Tue, 31 Jan 2012) New Revision: 2915 Modified: trunk/build/unix/buildtest.mod_cluster.sh Log: Arrange the tests: use maven. Modified: trunk/build/unix/buildtest.mod_cluster.sh =================================================================== --- trunk/build/unix/buildtest.mod_cluster.sh 2012-01-26 09:43:27 UTC (rev 2914) +++ trunk/build/unix/buildtest.mod_cluster.sh 2012-01-31 16:53:43 UTC (rev 2915) @@ -85,13 +85,26 @@ 1.2.*) (cd $anttestsdir echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root" - echo " -Dmod_cluster.jar=../../core/target/mod_cluster-core-${mod_cluster_version}.jar" - echo " -Dmod_cluster_spi.jar=../../container-spi/target/mod_cluster-container-spi-${mod_cluster_version}.jar" - echo " -Dmod_cluster_catalina.jar=../../container/catalina/target/mod_cluster-container-catalina-${mod_cluster_version}.jar" - echo " -Dmod_cluster_catalina_standalone.jar=../../container/catalina-standalone/target/mod_cluster-container-catalina-standalone-${mod_cluster_version}.jar" - echo " -Dmod_cluster_jbossweb.jar=../../container/jbossweb/target/mod_cluster-container-jbossweb-${mod_cluster_version}.jar" echo " -Dbase.apache=${BASELOC}" - ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=../../core/target/mod_cluster-core-${mod_cluster_version}.jar -Dmod_cluster_spi.jar=../../container-spi/target/mod_cluster-container-spi-${mod_cluster_version}.jar -Dmod_cluster_catalina.jar=../../container/catalina/target/mod_cluster-container-catalina-${mod_cluster_version}.jar -Dmod_cluster_catalina_standalone.jar=../../container/catalina-standalone/target/mod_cluster-container-catalina-standalone-${mod_cluster_version}.jar -Dmod_cluster_jbossweb.jar=../../container/jbossweb/target/mod_cluster-container-jbossweb-${mod_cluster_version}.jar -Dbase.apache="${BASELOC}" + ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dbase.apache="${BASELOC}" httpd + if [ $? -ne 0 ]; then + echo "Can't start httpd" + exit 1 + fi + mvn install + fail=false + if [ $? -ne 0 ]; then + echo "Some test have failed" + fail=true + fi + ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dbase.apache="${BASELOC}" stophttpd + if [ $? -ne 0]; then + fail=true + echo "Can't stop httpd" + fi + if $fail; then + exit 1 + fi ) || exit 1 ;; esac