[asterisk-commits] mnicholson: testsuite/bamboo/trunk r478 - /bamboo/trunk/bin/build-asterisk.sh

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Fri Jul  9 11:37:19 2010
New Revision: 478

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=478
Log:
run 'killall -9 asterisk' before running the unit tests

Modified:
    bamboo/trunk/bin/build-asterisk.sh

Modified: bamboo/trunk/bin/build-asterisk.sh
URL: http://svnview.digium.com/svn/testsuite/bamboo/trunk/bin/build-asterisk.sh?view=diff&rev=478&r1=477&r2=478
==============================================================================
--- bamboo/trunk/bin/build-asterisk.sh (original)
+++ bamboo/trunk/bin/build-asterisk.sh Fri Jul  9 11:37:19 2010
@@ -45,6 +45,11 @@
 		launchctl unload -w /Library/LaunchDaemons/com.asterisk.org.asterisk
 	fi
 
+	(killall -9 asterisk || :) > /dev/null 2>&1
+}
+
+killall_asterisk() {
+	echo "*** Killing all running Asterisk processes ***"
 	(killall -9 asterisk || :) > /dev/null 2>&1
 }
 
@@ -142,6 +147,7 @@
 ${MAKE} samples
 
 if [ "${UNIT_TESTS}" = "yes" ] ; then
+	killall_asterisk
 	start_asterisk
 	run_unit_tests
 	stop_asterisk