[jbossnative-commits] JBoss Native SVN: r2680 - trunk/build/unix.
Author: jfrederic.clere(a)jboss.com
Date: 2010-05-26 02:52:17 -0400 (Wed, 26 May 2010)
New Revision: 2680
Modified:
trunk/build/unix/buildbin.TC7.sh
Log:
Make sure we stop Tomcat before running tests...
Modified: trunk/build/unix/buildbin.TC7.sh
===================================================================
--- trunk/build/unix/buildbin.TC7.sh 2010-05-25 16:37:07 UTC (rev 2679)
+++ trunk/build/unix/buildbin.TC7.sh 2010-05-26 06:52:17 UTC (rev 2680)
@@ -54,7 +54,19 @@
native_sources=`(cd $native_sources; pwd)`
cd $native_sources
ant || exit 1
+
echo ""
+echo "Stopping tomcat (just in case)"
+echo ""
+(cd $native_sources/output/build; bin/shutdown.sh)
+sleep 10
+PID=`ps -ef | grep $native_sources | grep java | awk ' { print $2 } '`
+if [ x$PID != "x" ]; then
+ kill -15 $PID
+ sleep 10
+fi
+
+echo ""
echo "Running ant tests"
ant test || exit 1
echo "Ant test Done"
@@ -69,8 +81,6 @@
export JAVA_OPTS
EOF
-(cd $native_sources/output/build; bin/shutdown.sh)
-sleep 10
(cd $native_sources/output/build; bin/startup.sh)
echo ""
echo "Waiting for Tomcat to start"