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

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Mar 18 13:29:40 2010
New Revision: 99

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=99
Log:
Run external test suite on all release branches (no longer just trunk)

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=99&r1=98&r2=99
==============================================================================
--- bamboo/trunk/bin/build-asterisk.sh (original)
+++ bamboo/trunk/bin/build-asterisk.sh Thu Mar 18 13:29:40 2010
@@ -34,10 +34,6 @@
 	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
-
 	asterisk -rx "test generate results xml ${TEST_RESULTS_DIR}/unit-test-results.xml"
 
 	# https://issues.asterisk.org/view.php?id=17049
@@ -65,9 +61,11 @@
 
 set -e
 
-if [ -d "test-reports" ] ; then
+if [ -d ${TEST_RESULTS_DIR} ] ; then
 	rm -rf test-reports
 fi
+mkdir ${TEST_RESULTS_DIR}
+
 ./configure --enable-dev-mode
 make uninstall-all
 make menuselect.makeopts
@@ -92,18 +90,16 @@
 	stop_asterisk
 fi
 
-if [ "${PLAN}" = "AST-TRUNK" ] ; then
-	# Only run test suite on trunk for now, until Asterisk version handling
-	# is implemented in the test suite
+if [ "${PLAN}" = "AST-TRUNK" ] || [ "${PLAN}" = "AST-162" ] || [ "${PLAN}" = "AST-161" ] || [ "${PLAN}" = "AST-160" ] || [ "${PLAN}" = "AST-14" ] ; then
 	echo "*** Running external test suite ***"
 	svn co http://svn.digium.com/svn/testsuite/asterisk/trunk testsuite
 	cd testsuite
 	./run-tests.py
-	cp *.xml ../test-reports
+	cp *.xml ${TEST_RESULTS_DIR}
 fi
 
-if [ -d "test-reports" ] ; then
-	echo "*** Test Results: ***"
+if [ -d ${TEST_RESULTS_DIR} ] ; then
+	echo "*** Test Results: ${TEST_RESULTS_DIR} ***"
 	ls -l ${TEST_RESULTS_DIR}
 	cat ${TEST_RESULTS_DIR}/*.xml
 fi