diff options
| -rwxr-xr-x | testing/do-tests | 16 | ||||
| -rwxr-xr-x | testing/make-testing | 11 | ||||
| -rwxr-xr-x | testing/scripts/build-baseimage | 4 | ||||
| -rwxr-xr-x | testing/scripts/build-guestimages | 8 | ||||
| -rwxr-xr-x | testing/scripts/build-guestkernel | 4 | ||||
| -rwxr-xr-x | testing/scripts/build-rootimage | 6 | ||||
| -rwxr-xr-x | testing/scripts/function.sh | 3 | ||||
| -rwxr-xr-x | testing/scripts/load-testconfig | 4 | ||||
| -rwxr-xr-x | testing/scripts/restore-defaults | 6 | ||||
| -rwxr-xr-x | testing/start-testing | 6 | ||||
| -rwxr-xr-x | testing/stop-testing | 4 | ||||
| -rw-r--r-- | testing/testing.conf | 2 |
12 files changed, 44 insertions, 30 deletions
diff --git a/testing/do-tests b/testing/do-tests index d7512bf7f..14d723dbd 100755 --- a/testing/do-tests +++ b/testing/do-tests @@ -14,14 +14,14 @@ # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. -DIR=`dirname $0` - -. $PWD/scripts/function.sh - -[ -d $PWD/hosts ] || die "Directory 'hosts' not found" -[ -d $PWD/tests ] || die "Directory 'tests' not found" -[ -d $BUILDDIR ] || die "Directory '$BUILDDIR' does not exist, please run make-testing first" - +DIR=$(dirname `readlink -f $0`) +. $DIR/testing.conf +. $DIR/scripts/function.sh + +[ -d $DIR/hosts ] || die "Directory 'hosts' not found" +[ -d $DIR/tests ] || die "Directory 'tests' not found" +[ -d $BUILDDIR ] || + die "Directory '$BUILDDIR' does not exist, please run make-testing first" ############################################################################## # take care of new path and file variables diff --git a/testing/make-testing b/testing/make-testing index 2daf13144..cac4eddf8 100755 --- a/testing/make-testing +++ b/testing/make-testing @@ -1,25 +1,26 @@ #!/bin/bash -. $PWD/scripts/function.sh +DIR=$(dirname `readlink -f $0`) +. $DIR/testing.conf rm -f $LOGFILE if [ $ENABLE_BUILD_BASEIMAGE = "yes" ] then - $PWD/scripts/build-baseimage || exit 1 + $DIR/scripts/build-baseimage || exit 1 fi if [ $ENABLE_BUILD_ROOTIMAGE = "yes" ] then - $PWD/scripts/build-rootimage || exit 1 + $DIR/scripts/build-rootimage || exit 1 fi if [ $ENABLE_BUILD_GUESTKERNEL = "yes" ] then - $PWD/scripts/build-guestkernel || exit 1 + $DIR/scripts/build-guestkernel || exit 1 fi if [ $ENABLE_BUILD_GUESTIMAGES = "yes" ] then - $PWD/scripts/build-guestimages $HOSTS || exit 1 + $DIR/scripts/build-guestimages $HOSTS || exit 1 fi diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage index 81460d91c..6e420d772 100755 --- a/testing/scripts/build-baseimage +++ b/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" diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages index d07981a17..f5669040e 100755 --- a/testing/scripts/build-guestimages +++ b/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 diff --git a/testing/scripts/build-guestkernel b/testing/scripts/build-guestkernel index 84633bcd7..fdd19ac74 100755 --- a/testing/scripts/build-guestkernel +++ b/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" diff --git a/testing/scripts/build-rootimage b/testing/scripts/build-rootimage index ac9ee8bbc..8f2b3aa1c 100755 --- a/testing/scripts/build-rootimage +++ b/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 diff --git a/testing/scripts/function.sh b/testing/scripts/function.sh index a0afee83e..c4769678c 100755 --- a/testing/scripts/function.sh +++ b/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 diff --git a/testing/scripts/load-testconfig b/testing/scripts/load-testconfig index 1abe5985c..0ea4fbf00 100755 --- a/testing/scripts/load-testconfig +++ b/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 diff --git a/testing/scripts/restore-defaults b/testing/scripts/restore-defaults index 88d4f87a0..953548a1b 100755 --- a/testing/scripts/restore-defaults +++ b/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" diff --git a/testing/start-testing b/testing/start-testing index e2944bc77..e4e00bb1b 100755 --- a/testing/start-testing +++ b/testing/start-testing @@ -1,9 +1,11 @@ #!/bin/bash -. $PWD/scripts/function.sh +DIR=$(dirname `readlink -f $0`) +. $DIR/testing.conf +. $DIR/scripts/function.sh NETWORKS="vnet1 vnet2 vnet3" -CONFDIR=$PWD/config/kvm +CONFDIR=$DIR/config/kvm KNLSRC=$BUILDDIR/$KERNEL/arch/x86/boot/bzImage KNLTARGET=/var/run/kvm-swan-kernel HOSTFSTARGET=/var/run/kvm-swan-hostfs diff --git a/testing/stop-testing b/testing/stop-testing index 5695d620a..013637aca 100755 --- a/testing/stop-testing +++ b/testing/stop-testing @@ -1,6 +1,8 @@ #!/bin/bash -. $PWD/scripts/function.sh +DIR=$(dirname `readlink -f $0`) +. $DIR/testing.conf +. $DIR/scripts/function.sh echo "Stopping test environment" diff --git a/testing/testing.conf b/testing/testing.conf index 0d8eff3d2..b8bd3cf1b 100644 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -21,7 +21,7 @@ TESTDIR=/srv/strongswan-testing KERNELVERSION=3.5.3 KERNEL=linux-$KERNELVERSION KERNELTARBALL=$KERNEL.tar.bz2 -KERNELCONFIG=$PWD/config/kernel/config-3.5 +KERNELCONFIG=$DIR/../config/kernel/config-3.5 KERNELPATCH=ha-3.0.patch.bz2 # strongSwan version used in tests |