[svn-commits] pabelanger: branch pabelanger/run_tests r373531 - in /team/pabelanger/run_tes...

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Mon Sep 24 18:03:40 2012
New Revision: 373531

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373531
Log:
Remove bash dependency


Modified:
    team/pabelanger/run_tests/contrib/scripts/install_prereq
    team/pabelanger/run_tests/run_tests.sh

Modified: team/pabelanger/run_tests/contrib/scripts/install_prereq
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/run_tests/contrib/scripts/install_prereq?view=diff&rev=373531&r1=373530&r2=373531
==============================================================================
--- team/pabelanger/run_tests/contrib/scripts/install_prereq (original)
+++ team/pabelanger/run_tests/contrib/scripts/install_prereq Mon Sep 24 18:03:40 2012
@@ -21,7 +21,7 @@
 PACKAGES=""
 
 ubuntu_common() { 
-    PACKAGES="$PACKAGES build-essential subversion wget"
+    PACKAGES="$PACKAGES build-essential subversion wget python"
     PACKAGES="$PACKAGES libncurses5-dev libz-dev libssl-dev libxml2-dev libsqlite3-dev"
     PACKAGES="$PACKAGES libspeex-dev libspeexdsp-dev libogg-dev libvorbis-dev"
     PACKAGES="$PACKAGES libasound2-dev portaudio19-dev libcurl4-openssl-dev libneon27-dev"

Modified: team/pabelanger/run_tests/run_tests.sh
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/run_tests/run_tests.sh?view=diff&rev=373531&r1=373530&r2=373531
==============================================================================
--- team/pabelanger/run_tests/run_tests.sh (original)
+++ team/pabelanger/run_tests/run_tests.sh Mon Sep 24 18:03:40 2012
@@ -11,7 +11,7 @@
 environment_version=1
 #--------------------------------------------------------#
 
-function usage {
+usage() {
     echo "Usage: $0 [OPTION]..."
     echo ""
     exit
@@ -28,7 +28,7 @@
 DISTS="precise"
 ARCHS="i386"
 
-function process_option {
+process_option() {
     case "$1" in
         -N|--no-virtual-env) always_venv=0; never_venv=1;;
         -f|--force) force=1;;
@@ -38,14 +38,14 @@
     esac
 }
 
-function destroy_venv {
+destroy_venv() {
     echo "Removing environment..."
     sudo rm -rf $venv
     rm -f .environment_version
     echo "Environment removed."
 }
 
-function sanity_check {
+sanity_check() {
     if [ $never_venv -eq 0 ]; then
         if [ ! -e ${venv} ]; then
             echo "Virtualenv not found at $venv. Did you install it?"
@@ -54,7 +54,7 @@
     fi
 }
 
-function install_venv {
+install_venv() {
     for dist in ${DISTS}; do
         for arch in ${ARCHS}; do
             if ! [ -f ${venv}/${dist}-${arch}-base.tgz ]; then
@@ -66,7 +66,7 @@
     echo $environment_version > .environment_version
 }
 
-function environment_check {
+environment_check() {
     echo "Checking environment."
     if [ -f .environment_version ]; then
         ENV_VERS=`cat .environment_version`
@@ -80,9 +80,9 @@
 
     if [ $always_venv -eq 0 ]; then
         if [ ! -e ${venv} ]; then
-            echo -e "Environment not found. Install? (Y/n) \c"
+            echo "Environment not found. Install? (Y/n)"
         else
-            echo -e "Your environment appears to be out of date. Update? (Y/n) \c"
+            echo "Your environment appears to be out of date. Update? (Y/n)"
         fi
         read update_env
         if [ "x$update_env" = "xY" -o "x$update_env" = "x" -o "x$update_env" = "xy" ]; then
@@ -94,7 +94,7 @@
 
 }
 
-function run_tests {
+run_tests() {
     for dist in ${DISTS}; do
         for arch in ${ARCHS}; do
             sudo DIST=${dist} ARCH=${arch} pbuilder execute --configfile tools/pbuilderrc tools/compile.sh `pwd`