changes in uml configuration to allow mobike

This commit is contained in:
Andreas Steffen
2007-07-02 09:52:20 +00:00
parent face844a87
commit c598ac6360
6 changed files with 1156 additions and 22 deletions
+16 -18
View File
@@ -17,11 +17,11 @@
# RCSID $Id: testing.conf,v 1.52 2006/04/24 16:58:03 as Exp $
# Root directory of testing
UMLTESTDIR=/home/strongswan-testing
UMLTESTDIR=~/strongswan-testing
# Bzipped kernel sources
# (file extension .tar.bz2 required)
KERNEL=$UMLTESTDIR/linux-2.6.21.1.tar.bz2
KERNEL=$UMLTESTDIR/linux-2.6.21.5.tar.bz2
# Extract kernel version
KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
@@ -30,10 +30,11 @@ KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
KERNELCONFIG=$UMLTESTDIR/.config-2.6.21
# Bzipped uml patch for kernel
UMLPATCH=$UMLTESTDIR/uml_jmpbuf-2.6.18.patch.bz2
# (not needed anymore for 2.6.9 kernel or higher)
#UMLPATCH=$UMLTESTDIR/uml_jmpbuf-2.6.18.patch.bz2
# Bzipped source of strongSwan
STRONGSWAN=$UMLTESTDIR/strongswan-4.1.3.tar.bz2
STRONGSWAN=$UMLTESTDIR/strongswan-4.1.4.tar.bz2
# strongSwan compile options (use "yes" or "no")
USE_LIBCURL="yes"
@@ -55,7 +56,7 @@ MEM=96
BUILDDIR=$UMLTESTDIR/umlbuild
# Filename of the built UML Kernel
UMLKERNEL=$UMLTESTDIR/linux
UMLKERNEL=$BUILDDIR/linux-uml-$KERNELVERSION
# Directory where test results will be stored
TESTRESULTSDIR=$UMLTESTDIR/testresults
@@ -72,22 +73,22 @@ TZUML="Europe/Zurich"
# Enable particular steps in the make-testing and
# start-testing scripts
#
ENABLE_BUILD_UMLKERNEL="no"
ENABLE_BUILD_UMLKERNEL="yes"
ENABLE_BUILD_SSHKEYS="yes"
ENABLE_BUILD_HOSTCONFIG="yes"
ENABLE_BUILD_UMLROOTFS="yes"
ENABLE_BUILD_UMLHOSTFS="yes"
ENABLE_START_TESTING="no"
ENABLE_DO_TESTS="no"
ENABLE_START_TESTING="yes"
ENABLE_DO_TESTS="yes"
ENABLE_STOP_TESTING="no"
##############################################################
# How to start the UMLs?
#
# Start the UML instance in KDE konsole (requires KDE)
#UMLSTARTMODE="gnome-terminal"
UMLSTARTMODE="konsole"
# Start the UML instance in an xterm (requires X11R6)
UMLSTARTMODE="xterm"
# UMLSTARTMODE="xterm"
# Start the UML instance without a terminal window
# but screen -r <host> can open a window anytime
# UMLSTARTMODE="screen"
@@ -100,7 +101,7 @@ SELECTEDTESTSONLY="no"
# Tests to do if $SELECTEDTESTSONLY is set "yes".
#
SELECTEDTESTS="ikev2-net2net ikev2-rw"
SELECTEDTESTS="ikev2/rw-cert"
##############################################################
# hostname and corresponding IPv4 and IPv6 addresses
@@ -109,7 +110,7 @@ SELECTEDTESTS="ikev2-net2net ikev2-rw"
# Also don't use IPs ending with 254, they are reserved!
#
HOSTNAMEIPV4="\
alice,10.1.0.10 \
alice,10.1.0.10,192.168.0.50 \
venus,10.1.0.20 \
moon,192.168.0.1,10.1.0.1 \
carol,192.168.0.100,10.3.0.1 \
@@ -119,7 +120,7 @@ sun,192.168.0.2,10.2.0.1 \
bob,10.2.0.10"
HOSTNAMEIPV6="\
alice,fec1::10 \
alice,fec1::10,fec0::5 \
venus,fec1::20 \
moon,fec0::1,fec1::1 \
carol,fec0::10,fec3::1 \
@@ -153,7 +154,8 @@ IFCONFIG_2="10.2.0.254 netmask 255.255.0.0"
##############################################################
# Network interfaces of the UML instances
#
SWITCH_alice="eth0=daemon,fe:fd:0a:01:00:0a,unix,/tmp/umlswitch1"
SWITCH_alice="eth0=daemon,fe:fd:0a:01:00:0a,unix,/tmp/umlswitch1 \
eth1=daemon,fe:fd:c0:a8:00:32,unix,/tmp/umlswitch0"
SWITCH_venus="eth0=daemon,fe:fd:0a:01:00:14,unix,/tmp/umlswitch1"
SWITCH_moon="eth0=daemon,fe:fd:c0:a8:00:01,unix,/tmp/umlswitch0 \
eth1=daemon,fe:fd:0a:01:00:01,unix,/tmp/umlswitch1"
@@ -163,7 +165,3 @@ SWITCH_dave="eth0=daemon,fe:fd:c0:a8:00:c8,unix,/tmp/umlswitch0"
SWITCH_sun="eth0=daemon,fe:fd:c0:a8:00:02,unix,/tmp/umlswitch0 \
eth1=daemon,fe:fd:0a:02:00:01,unix,/tmp/umlswitch2"
SWITCH_bob="eth0=daemon,fe:fd:0a:02:00:0a,unix,/tmp/umlswitch2"