Imported Upstream version 5.1.1

1 files changed, 40 insertions, 34 deletions

diff --git a/testing/testing.conf b/testing/testing.conf
index 638762f9b..21055b85a 100644
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -14,64 +14,70 @@
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
 
+TESTINGDIR=$(dirname `readlink -f ${BASH_SOURCE[0]}`)
+if [ -f $TESTINGDIR/testing.conf.local ]
+then
+	. $TESTINGDIR/testing.conf.local
+fi
+
 # Root directory of testing
-TESTDIR=/srv/strongswan-testing
+: ${TESTDIR=/srv/strongswan-testing}
 
 # Kernel configuration
-KERNELVERSION=3.8.1
-KERNEL=linux-$KERNELVERSION
-KERNELTARBALL=$KERNEL.tar.bz2
-KERNELCONFIG=$DIR/../config/kernel/config-3.8
-KERNELPATCH=ha-3.8-abicompat.patch.bz2
+: ${KERNELVERSION=3.11.6}
+: ${KERNEL=linux-$KERNELVERSION}
+: ${KERNELTARBALL=$KERNEL.tar.bz2}
+: ${KERNELCONFIG=$DIR/../config/kernel/config-3.11}
+: ${KERNELPATCH=ha-3.11-abicompat.patch.bz2}
 
 # strongSwan version used in tests
-SWANVERSION=5.0.3
+: ${SWANVERSION=5.1.1}
 
 # Build directory where the guest kernel and images will be built
-BUILDDIR=$TESTDIR/build
+: ${BUILDDIR=$TESTDIR/build}
 # Directory shared between host and guests
-SHAREDDIR=$BUILDDIR/shared
+: ${SHAREDDIR=$BUILDDIR/shared}
 
 # Logfile
-LOGFILE=$BUILDDIR/testing.log
+: ${LOGFILE=$BUILDDIR/testing.log}
 
 # Directory used for loop-mounts
-LOOPDIR=$BUILDDIR/loop
+: ${LOOPDIR=$BUILDDIR/loop}
 
 # Common image settings
-IMGEXT=qcow2
-IMGDIR=$BUILDDIR/images
+: ${IMGEXT=qcow2}
+: ${IMGDIR=$BUILDDIR/images}
 
 # Base image settings
 # The base image is a pristine OS installation created using debootstrap.
-BASEIMGSIZE=1280
-BASEIMGSUITE=wheezy
-BASEIMGARCH=amd64
-BASEIMG=$IMGDIR/debian-$BASEIMGSUITE-$BASEIMGARCH.$IMGEXT
-BASEIMGMIRROR=http://cdn.debian.net/debian
+: ${BASEIMGSIZE=1280}
+: ${BASEIMGSUITE=wheezy}
+: ${BASEIMGARCH=amd64}
+: ${BASEIMG=$IMGDIR/debian-$BASEIMGSUITE-$BASEIMGARCH.$IMGEXT}
+: ${BASEIMGMIRROR=http://cdn.debian.net/debian}
 
 # Root image settings
 # The root image is the origin of all guest images. It is a clone of the base
 # image and contains additional test-specific software and patches.
-ROOTIMG=$IMGDIR/root.$IMGEXT
+: ${ROOTIMG=$IMGDIR/root.$IMGEXT}
 
 # libvirt config
-NBDEV=/dev/nbd0
-NBDPARTITION=${NBDEV}p1
-VIRTIMGSTORE=/var/lib/libvirt/images
-KVMUSER=libvirt-qemu
-KVMGROUP=kvm
+: ${NBDEV=/dev/nbd0}
+: ${NBDPARTITION=${NBDEV}p1}
+: ${VIRTIMGSTORE=/var/lib/libvirt/images}
+: ${KVMUSER=libvirt-qemu}
+: ${KVMGROUP=kvm}
 
 # Directory where test results will be stored
-TESTRESULTSDIR=$TESTDIR/testresults
+: ${TESTRESULTSDIR=$TESTDIR/testresults}
 
 ##############################################################
 # Enable particular steps in the make-testing
 #
-ENABLE_BUILD_BASEIMAGE="yes"
-ENABLE_BUILD_ROOTIMAGE="yes"
-ENABLE_BUILD_GUESTKERNEL="yes"
-ENABLE_BUILD_GUESTIMAGES="yes"
+: ${ENABLE_BUILD_BASEIMAGE=yes}
+: ${ENABLE_BUILD_ROOTIMAGE=yes}
+: ${ENABLE_BUILD_GUESTKERNEL=yes}
+: ${ENABLE_BUILD_GUESTIMAGES=yes}
 
 ##############################################################
 # hostname and corresponding IPv4 and IPv6 addresses
@@ -79,7 +85,7 @@ ENABLE_BUILD_GUESTIMAGES="yes"
 # this means retain the netmasks!
 # Also don't use IPs ending with 254, they are reserved!
 #
-HOSTNAMEIPV4="\
+: ${HOSTNAMEIPV4="\
 alice,10.1.0.10,192.168.0.50 \
 venus,10.1.0.20 \
 moon,192.168.0.1,10.1.0.1 \
@@ -87,9 +93,9 @@ carol,192.168.0.100,10.3.0.1 \
 winnetou,192.168.0.150 \
 dave,192.168.0.200,10.3.0.2 \
 sun,192.168.0.2,10.2.0.1 \
-bob,10.2.0.10"
+bob,10.2.0.10"}
 
-HOSTNAMEIPV6="\
+: ${HOSTNAMEIPV6="\
 alice,fec1::10,fec0::5 \
 venus,fec1::20 \
 moon,fec0::1,fec1::1 \
@@ -97,11 +103,11 @@ carol,fec0::10,fec3::1 \
 winnetou,fec0::15 \
 dave,fec0::20,fec3::2 \
 sun,fec0::2,fec2::1 \
-bob,fec2::10"
+bob,fec2::10"}
 
 ##############################################################
 # VPN gateways / clients
 # The hosts stated here will be created. Possible values
 # are sun, moon, dave, carol, alice, venus, bob, winnetou.
 #
-STRONGSWANHOSTS="alice bob carol dave moon sun venus winnetou"
+: ${STRONGSWANHOSTS="alice bob carol dave moon sun venus winnetou"}