JBoss Native SVN: r2859 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-11-28 11:33:00 -0500 (Mon, 28 Nov 2011)
New Revision: 2859
Modified:
trunk/build/unix/buildtest.mod_cluster.sh
Log:
Arrange the logic to run test in the new version.
Modified: trunk/build/unix/buildtest.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildtest.mod_cluster.sh 2011-11-25 16:20:23 UTC (rev 2858)
+++ trunk/build/unix/buildtest.mod_cluster.sh 2011-11-28 16:33:00 UTC (rev 2859)
@@ -51,20 +51,14 @@
# 1.0.0.Beta4 = 1.0.0.Beta4
case ${build_version} in
*.dev)
- mod_cluster_jar=`echo ${build_version} | sed 's:.dev:-SNAPSHOT:'`
+ mod_cluster_version=`echo ${build_version} | sed 's:.dev:-SNAPSHOT:'`
;;
*)
- mod_cluster_jar=${build_version}
+ mod_cluster_version=${build_version}
;;
esac
-# there are 2 names (mod_cluster and mod-cluster)
-mod_cluster_dir=`(cd ${anttestsdir}/../../target; pwd)`
-if [ -f ${mod_cluster_dir}/mod_cluster-${mod_cluster_jar}.jar ]; then
- mod_cluster_jar=../../target/mod_cluster-${mod_cluster_jar}.jar
-else
- mod_cluster_jar=../../target/mod-cluster-${mod_cluster_jar}.jar
-fi
+# find the base
(cd $anttestsdir
if [ "${BUILD_SYS}" = "windows" ]; then
BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'`
@@ -73,10 +67,30 @@
# it may not work on some machine but that could help.
ulimit -c unlimited
fi
- echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar} -Dbase.apache=${BASELOC}"
- ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar} -Dbase.apache="${BASELOC}"
-) || exit 1
+)
+# Do the right build depending on the version....
+case ${build_version} in
+ 1.0.*)
+(cd $anttestsdir
+ echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=../../target/mod-cluster-${mod_cluster_version}.jar -Dbase.apache=${BASELOC}"
+ ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=../../target/mod-cluster-${mod_cluster_version}.jar -Dbase.apache="${BASELOC}"
+) || exit 1
+ ;;
+ 1.1.*)
+(cd $anttestsdir
+ echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=../../target/mod_cluster-${mod_cluster_version}.jar -Dbase.apache=${BASELOC}"
+ ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=../../target/mod_cluster-${mod_cluster_version}.jar -Dbase.apache="${BASELOC}"
+) || exit 1
+ ;;
+ 1.2.*)
+(cd $anttestsdir
+ echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=../../core/target/mod_cluster-core-${mod_cluster_version}.jar ... -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 -Dbase.apache="${BASELOC}"
+) || exit 1
+ ;;
+esac
+
echo ""
echo "SUCCESS : `basename $0` $LastChangedDate$"
echo ""
