[svn-commits] russell: testsuite/bamboo/trunk r97 - /bamboo/trunk/bin/build-asterisk.sh

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Mar 18 08:02:25 2010
New Revision: 97

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=97
Log:
spaces to tabs, stop Asterisk before exit on unit test failure

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=97&r1=96&r2=97
==============================================================================
--- bamboo/trunk/bin/build-asterisk.sh (original)
+++ bamboo/trunk/bin/build-asterisk.sh Thu Mar 18 08:02:25 2010
@@ -31,25 +31,28 @@
 }
 
 run_unit_tests() {
-       echo "*** Executing Unit Tests (Results: ${TEST_RESULTS_DIR}/unit-test-results.xml) ***"
-       asterisk -rx "test execute all"
+	echo "*** Executing Unit Tests (Results: ${TEST_RESULTS_DIR}/unit-test-results.xml) ***"
+	asterisk -rx "test execute all"
 
-       if [ ! -d ${TEST_RESULTS_DIR} ] ; then
-               mkdir ${TEST_RESULTS_DIR}
-       fi
+	if [ ! -d ${TEST_RESULTS_DIR} ] ; then
+		mkdir ${TEST_RESULTS_DIR}
+	fi
 
-       asterisk -rx "test generate results xml ${TEST_RESULTS_DIR}/unit-test-results.xml"
+	asterisk -rx "test generate results xml ${TEST_RESULTS_DIR}/unit-test-results.xml"
 
-       LOOPCOUNT=0
-       while [ ! -s "${TEST_RESULTS_DIR}/unit-test-results.xml" ] ; do
-               sleep 1
-               LOOPCOUNT=$[${LOOPCOUNT} + 1]
-               if [ ${LOOPCOUNT} == 30 ] ; then
-                       echo "*** ERROR: Waited 30 seconds and never got unit test results! ***"
-                       exit 1
-                       break
-               fi
-       done
+	# https://issues.asterisk.org/view.php?id=17049
+
+	LOOPCOUNT=0
+	while [ ! -s "${TEST_RESULTS_DIR}/unit-test-results.xml" ] ; do
+		sleep 1
+		LOOPCOUNT=$[${LOOPCOUNT} + 1]
+		if [ ${LOOPCOUNT} == 30 ] ; then
+			echo "*** ERROR: Waited 30 seconds and never got unit test results! ***"
+			stop_asterisk
+			exit 1
+			break
+		fi
+	done
 }
 
 export PATH=/usr/lib/ccache:/usr/local/sbin:${PATH}