Rename build-umlkernel script to build-guestkernel

testing/testing.conf

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Global configuration file for strongswan UML testing.
+# Global configuration file for strongswan integration testing.
 #
 # Copyright (C) 2004  Eric Marchionni, Patrik Rayo
 # Zuercher Hochschule Winterthur
@@ -17,18 +17,12 @@
 # Root directory of testing
 UMLTESTDIR=~/strongswan-testing
 
-# Bzipped kernel sources
-# (file extension .tar.bz2 required)
-KERNEL=$UMLTESTDIR/linux-3.5.3.tar.bz2
-
-# Extract kernel version
-KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
-
-# Kernel configuration file
-KERNELCONFIG=$UMLTESTDIR/.config-3.5
-
-# Bzipped uml patch for kernel
-UMLPATCH=$UMLTESTDIR/ha-3.0.patch.bz2
+# Kernel configuration
+KERNELVERSION=3.5.3
+KERNEL=linux-$KERNELVERSION
+KERNELTARBALL=$KERNEL.tar.bz2
+KERNELCONFIG=$PWD/config/kernel/config-3.5
+KERNELPATCH=ha-3.0.patch.bz2
 
 # strongSwan version used in tests
 SWANVERSION=5.0.2dr4
@@ -75,7 +69,7 @@ TZUML="Europe/Zurich"
 # start-testing scripts
 #
 ENABLE_BUILD_BASEIMAGE="yes"
-ENABLE_BUILD_UMLKERNEL="yes"
+ENABLE_BUILD_GUESTKERNEL="yes"
 ENABLE_BUILD_UMLROOTFS="yes"
 ENABLE_BUILD_UMLHOSTFS="yes"