[svn-commits] russell: testsuite/bamboo/trunk r129 - /bamboo/trunk/bin/

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Mar 24 15:12:57 2010
New Revision: 129

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=129
Log:
Make the Asterisk build/test script ensure that the latest asttest is in PATH

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

Modified: bamboo/trunk/bin/build-asterisk-wrapper.sh
URL: http://svnview.digium.com/svn/testsuite/bamboo/trunk/bin/build-asterisk-wrapper.sh?view=diff&rev=129&r1=128&r2=129
==============================================================================
--- bamboo/trunk/bin/build-asterisk-wrapper.sh (original)
+++ bamboo/trunk/bin/build-asterisk-wrapper.sh Wed Mar 24 15:12:57 2010
@@ -7,7 +7,10 @@
 svn co http://svn.digium.com/svn/testsuite/bamboo/trunk
 cd trunk
 make install
-cd ../..
+cd asttest
+make
+make install BINDIR=/usr/local/bin
+cd ../../..
 rm -rf bamboo
 
 set -e

Modified: bamboo/trunk/bin/build-asterisk.sh
URL: http://svnview.digium.com/svn/testsuite/bamboo/trunk/bin/build-asterisk.sh?view=diff&rev=129&r1=128&r2=129
==============================================================================
--- bamboo/trunk/bin/build-asterisk.sh (original)
+++ bamboo/trunk/bin/build-asterisk.sh Wed Mar 24 15:12:57 2010
@@ -111,7 +111,10 @@
 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
+	cd testsuite/asttest
+	make
+	export PATH=`pwd`:${PATH}
+	cd ..
 	./runtests.py
 	cp *.xml ${TEST_RESULTS_DIR}
 fi