From 7c2ef58e86c10e0cf9846dc9211cc68c7e908f7f Mon Sep 17 00:00:00 2001
From: Reto Buerki <reet@codelabs.ch>
Date: Thu, 6 Dec 2012 19:03:45 +0100
Subject: Import testing.conf file in function.sh

This is needed to have access to $LOGFILE and possibly other config
settings.
---
 testing/scripts/function.sh | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'testing/scripts/function.sh')

diff --git a/testing/scripts/function.sh b/testing/scripts/function.sh
index a04490aec..3e0560a46 100755
--- a/testing/scripts/function.sh
+++ b/testing/scripts/function.sh
@@ -14,6 +14,21 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 
+export TERM=xterm
+RED=$(tput setaf 1)
+GREEN=$(tput setaf 2)
+NORMAL=$(tput op)
+
+# exit with given error message
+# $1 - error message
+die() {
+	echo -e "${RED}$1${NORMAL}"
+	exit 1
+}
+
+[ -f testing.conf ] || die "Configuration file 'testing.conf' not found"
+. testing.conf
+
 # execute command
 # $1 - command to execute
 # $2 - whether or not to log command exit status
@@ -40,11 +55,6 @@ execute_chroot()
 	execute "chroot $LOOPDIR $@"
 }
 
-export TERM=xterm
-RED=$(tput setaf 1)
-GREEN=$(tput setaf 2)
-NORMAL=$(tput op)
-
 function cecho {
     echo -e "\033[1;31m$1\033[0m"
 }
@@ -76,13 +86,6 @@ log_status()
 	echo
 }
 
-# exit with given error message
-# $1 - error message
-die() {
-	echo -e "${RED}$1${NORMAL}"
-	exit 1
-}
-
 #############################################
 # search and replace strings throughout a
 # whole directory
-- 
cgit v1.2.3