Make test scripts callable from any path

testing/scripts/build-baseimage

@@ -2,7 +2,9 @@
 
 echo "Building base image"
 
-. $PWD/scripts/function.sh
+DIR=$(dirname `readlink -f $0`)
+. $DIR/../testing.conf
+. $DIR/function.sh
 
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 

testing/scripts/build-guestimages

@@ -16,9 +16,11 @@
 
 echo "Creating guest images"
 
-. $PWD/scripts/function.sh
+DIR=$(dirname `readlink -f $0`)
+. $DIR/../testing.conf
+. $DIR/function.sh
 
-HOSTSDIR=$PWD/hosts
+HOSTSDIR=$DIR/../hosts
 
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 [ -f $ROOTIMG ] || die "Root image $ROOTIMG not found"
@@ -47,7 +49,7 @@ do
 	if [ "$host" = "winnetou" ]
 	then
 		execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0
-		execute "cp -rf $PWD/images $LOOPDIR/var/www/" 0
+		execute "cp -rf $DIR/../images $LOOPDIR/var/www/" 0
 		execute_chroot "ln -s /etc/openssl/certs /var/www/certs" 0
 		execute_chroot "/etc/openssl/generate-crl" 0
 		execute_chroot "update-rc.d apache2 defaults" 0

testing/scripts/build-guestkernel

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-. $PWD/scripts/function.sh
+DIR=$(dirname `readlink -f $0`)
+. $DIR/../testing.conf
+. $DIR/function.sh
 
 echo "Building guest kernel version $KERNELVERSION"
 

testing/scripts/build-rootimage

@@ -16,7 +16,9 @@
 
 echo "Building root image"
 
-. $PWD/scripts/function.sh
+DIR=$(dirname `readlink -f $0`)
+. $DIR/../testing.conf
+. $DIR/function.sh
 
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 [ -f "$BASEIMG" ] || die "Base image $BASEIMG not found"
@@ -52,7 +54,7 @@ do_on_exit rm -r $LOOPDIR/root/compile
 do_on_exit umount $LOOPDIR/root/compile
 
 echo "Installing software from source"
-RECPDIR=$PWD/scripts/recipes
+RECPDIR=$DIR/recipes
 RECIPES=`ls $RECPDIR/*.mk | xargs -n1 basename`
 execute "cp -r $RECPDIR/patches $LOOPDIR/root/compile" 0
 for r in $RECIPES

testing/scripts/function.sh

@@ -26,9 +26,6 @@ die() {
 	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

testing/scripts/load-testconfig

@@ -14,7 +14,9 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 
-. $PWD/scripts/function.sh
+DIR=$(dirname `readlink -f $0`)
+. $DIR/../testing.conf
+. $DIR/function.sh
 
 ##########################################################################
 # load-testconfig requires a testname as an argument

testing/scripts/restore-defaults

@@ -14,11 +14,13 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 
-. $PWD/scripts/function.sh
+DIR=$(dirname `readlink -f $0`)
+. $DIR/../testing.conf
+. $DIR/function.sh
 
 testname=$1
 
-HOSTCONFIGDIR=$PWD/hosts
+HOSTCONFIGDIR=$DIR/../hosts
 TESTSDIR=$BUILDDIR/tests
 
 [ -d $TESTSDIR ] || die "Directory '$TESTSDIR' not found"