[asterisk-commits] tilghman: testsuite/bamboo/trunk r820 - /bamboo/trunk/bin/build-asterisk.sh

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Nov  3 14:25:52 2010
New Revision: 820

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=820
Log:
Don't build the external tests on slow hosts

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=820&r1=819&r2=820
==============================================================================
--- bamboo/trunk/bin/build-asterisk.sh (original)
+++ bamboo/trunk/bin/build-asterisk.sh Wed Nov  3 14:25:52 2010
@@ -3,7 +3,8 @@
 # Build and test Asterisk from http://bamboo.asterisk.org/.
 #
 # Platforms tested
-#  - Linux
+#  - Linux i686/x86_64
+#  - Mac OSX 10.4
 #  - Mac OSX 10.6
 #  - FreeBSD 8.0
 #
@@ -130,6 +131,24 @@
 	CODE_COVERAGE=no
 fi
 
+# We only run external tests for certain build targets
+if [ "${PLAN}" = "AST-TRUNK" ] ||
+	[ "${PLAN}" = "AST-18" ] ||
+	[ "${PLAN}" = "AST-162" ] ||
+	[ "${PLAN}" = "AST-161" ] ||
+	[ "${PLAN}" = "AST-160" ] ||
+	[ "${PLAN}" = "AST-14" ] ||
+	[ "1" = "0" ] ; then   # Intentionally false, so when we add/remove targets, we never have to change this line.
+	EXTERNAL_TESTS=yes
+else
+	EXTERNAL_TESTS=no
+fi
+
+# Additionally, we do not run external tests for really slow build hosts.
+if [ `uname -s` = "Linux" && `grep mips /proc/cpuinfo | head -1 | cut -d: -f2 | cut -d. -f1` -lt 2000 ]; then
+	EXTERNAL_TESTS=no
+fi
+
 set -e
 
 if [ -d ${TEST_RESULTS_DIR} ] ; then
@@ -213,7 +232,7 @@
 	run_unit_tests
 fi
 
-if [ "${PLAN}" = "AST-TRUNK" ] || [ "${PLAN}" = "AST-162" ] || [ "${PLAN}" = "AST-161" ] || [ "${PLAN}" = "AST-160" ] || [ "${PLAN}" = "AST-14" ] || [ "${PLAN}" = "AST-18" ] ; then
+if [ "${EXTERNAL_TESTS}" = "yes" ]; then
 	echo "*** Running external test suite ***"
 	svn co http://svn.digium.com/svn/testsuite/asterisk/trunk testsuite
 	cd testsuite/asttest
@@ -226,7 +245,7 @@
 	cd ..
 fi
 
-if [ "$(ls -A ${TEST_RESULTS_DIR})" ] ; then
+if ls -A ${TEST_RESULTS_DIR} >/dev/null 2>&1 ; then
 	echo "*** Test Results: ${TEST_RESULTS_DIR} ***"
 	ls -l ${TEST_RESULTS_DIR}
 	cat ${TEST_RESULTS_DIR}/*.xml