Import testing.conf file in function.sh

This is needed to have access to $LOGFILE and possibly other config
settings.

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index 08da30f08352ef76317471c3f3fd64a12a1b9313..4b81c5cdbc50b596da48371c69296b76054f9884 100755 (executable)
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -2,15 +2,10 @@
 
 echo "Building base image"
 
-DIR=`dirname $0`
-
-. $DIR/function.sh
+. $PWD/scripts/function.sh
 
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 
-[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found"
-. $DIR/../testing.conf
-
 # additional packages
 EXTRAS=build-essential,gperf,libgmp-dev,libldap2-dev,libcurl4-openssl-dev,libxml2-dev,libtspi-dev,libsqlite3-dev,openssh-server,tcpdump,psmisc,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core
 SERVICES="isc-dhcp-server apache2 slapd"

diff --git a/testing/scripts/build-umlhostfs b/testing/scripts/build-umlhostfs
index ada9696c7672cfe6ae1f6164a7a6e514d5108609..e5355988cd7db2e14a8afbe42d2be491f7253cfc 100755 (executable)
--- a/testing/scripts/build-umlhostfs
+++ b/testing/scripts/build-umlhostfs
@@ -16,18 +16,13 @@
 
 echo "Creating guest images"
 
-DIR=`dirname $0`
-
-. $DIR/function.sh
+. $PWD/scripts/function.sh
 
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 
-[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found"
-. $DIR/../testing.conf
-
 BASE=$BUILDDIR/base.img
 ROOTFSDIR=$BUILDDIR/root-fs
-HOSTSDIR=$DIR/../hosts
+HOSTSDIR=$PWD/hosts
 
 [ -f $BASE ] || die "Base image $BASE not found"
 [ -f $HOSTDIR ] || die "Hosts directory $HOSTSDIR not found"

diff --git a/testing/scripts/build-umlkernel b/testing/scripts/build-umlkernel
index 3947e4ab1a211f8858cff948e29465a2620f7c73..6e17af430dce328589f2190033cdcf06452b9ade 100755 (executable)
--- a/testing/scripts/build-umlkernel
+++ b/testing/scripts/build-umlkernel
@@ -14,12 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 
-DIR=`dirname $0`
-. $DIR/function.sh
-
-[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found"
-
-. $DIR/../testing.conf
+. $PWD/scripts/function.sh
 
 echo "Building guest kernel version $KERNELVERSION"
 

diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index a0444de38508d2d96943db681c26fc1f153483ec..6c67a25342d76bfa2030b10e4fae243335bca29f 100755 (executable)
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -16,15 +16,10 @@
 
 echo "Building root image"
 
-DIR=`dirname $0`
-
-. $DIR/function.sh
+. $PWD/scripts/function.sh
 
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 
-[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found"
-. $DIR/../testing.conf
-
 [ -f "$ROOTFS" ] || die "Root image $ROOTFS not found"
 
 ROOTFSDIR=$BUILDDIR/root-fs

diff --git a/testing/scripts/function.sh b/testing/scripts/function.sh
index a04490aeccc61380acdb2037e11a6d119c5d3d03..3e0560a46c1da689f226085ea6da9abfa5a149cf 100755 (executable)
--- 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

diff --git a/testing/scripts/install-shared b/testing/scripts/install-shared
index 4cfac9e77effbff8384050fa0accda6715cb8625..0f961aef94f72563878b4834dd91525c3291e07c 100755 (executable)
--- a/testing/scripts/install-shared
+++ b/testing/scripts/install-shared
@@ -17,13 +17,7 @@
 # for more details.
 #
 
-DIR=`dirname $0`
-
-source $DIR/function.sh
-
-[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found"
-
-source $DIR/../testing.conf
+. $PWD/scripts/function.sh
 
 cecho "installing strongSwan from shared tree"
 cecho-n "  on: "

diff --git a/testing/scripts/load-testconfig b/testing/scripts/load-testconfig
index d73b3127539031a0724e08953df30b9c5deb067c..1abe5985c470ca3f048aac82abd482528b6a18a3 100755 (executable)
--- a/testing/scripts/load-testconfig
+++ b/testing/scripts/load-testconfig
@@ -14,13 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 
-DIR=`dirname $0`
-
-source $DIR/function.sh
-
-[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found"
-
-source $DIR/../testing.conf
+. $PWD/scripts/function.sh
 
 ##########################################################################
 # load-testconfig requires a testname as an argument

diff --git a/testing/scripts/restore-defaults b/testing/scripts/restore-defaults
index 6bad3c5f0b383c9a932d4ea8081f0e3b8be532c8..16714db26340341bf9b2622dfd69b37c7305a225 100755 (executable)
--- a/testing/scripts/restore-defaults
+++ b/testing/scripts/restore-defaults
@@ -14,12 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 
-DIR=`dirname $0`
-
-. $DIR/function.sh
-
-[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found"
-. $DIR/../testing.conf
+. $PWD/scripts/function.sh
 
 ##########################################################################
 # load-testconfig requires a testname as an argument
@@ -27,7 +22,7 @@ DIR=`dirname $0`
 
 testname=$1
 
-HOSTCONFIGDIR=$DIR/../hosts
+HOSTCONFIGDIR=$PWD/hosts
 TESTSDIR=$BUILDDIR/tests
 
 [ -d $TESTSDIR ] || die "Directory '$TESTSDIR' not found"

diff --git a/testing/scripts/shutdown-umls b/testing/scripts/shutdown-umls
index e71e4660253e916a28ef2c1e7a0e43e93acbd557..9d37ab1d83a9b19ea8f82e63a67658a6b265a2cf 100755 (executable)
--- a/testing/scripts/shutdown-umls
+++ b/testing/scripts/shutdown-umls
@@ -17,13 +17,7 @@
 # for more details.
 #
 
-DIR=`dirname $0`
-
-source $DIR/function.sh
-
-[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found"
-
-source $DIR/../testing.conf
+. $PWD/scripts/function.sh
 
 cecho "shutting down"
 cecho-n "  "

diff --git a/testing/scripts/start-umls b/testing/scripts/start-umls
index 470bdc61b5200e769e67c5dedeeaf9ad6df18924..f9578d751f4ad3b54153f0230ef6947725a14eb8 100755 (executable)
--- a/testing/scripts/start-umls
+++ b/testing/scripts/start-umls
@@ -14,13 +14,7 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 
-DIR=`dirname $0`
-
-source $DIR/function.sh
-
-[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found"
-
-source $DIR/../testing.conf
+. $PWD/scripts/function.sh
 
 if [ "$#" -eq 0 ]
 then