diff options
| -rwxr-xr-x | testing/scripts/start-switches | 2 | ||||
| -rwxr-xr-x | testing/scripts/start-umls | 2 | ||||
| -rwxr-xr-x | testing/scripts/xstart-umls | 1 | ||||
| -rwxr-xr-x | testing/testing.conf | 25 |
4 files changed, 14 insertions, 16 deletions
diff --git a/testing/scripts/start-switches b/testing/scripts/start-switches index 400f06c54..1a6c9d8f6 100755 --- a/testing/scripts/start-switches +++ b/testing/scripts/start-switches @@ -31,7 +31,7 @@ do cecho " * Great, umlswitch$n is already running!" else cecho-n " * Starting umlswitch$n.." - uml_switch -hub -tap tap$n -unix /tmp/umlswitch$n -daemon >/dev/null 2>&1 </dev/null + uml_switch -tap tap$n -unix /tmp/umlswitch$n -daemon >/dev/null 2>&1 </dev/null sleep 2 eval ifconfig "tap$n \$IFCONFIG_$n up" cgecho "done" diff --git a/testing/scripts/start-umls b/testing/scripts/start-umls index 6ef79f587..018bad010 100755 --- a/testing/scripts/start-umls +++ b/testing/scripts/start-umls @@ -57,7 +57,7 @@ do [ -f $UMLHOSTFS ] || die "!! uml root file system '$UMLHOSTFS' not found" cecho-n " * Starting ${host}.." - eval screen -dmS ${host} "nice $UMLKERNEL \ + eval screen -dmS ${host} "$UMLKERNEL \ umid=${host} \ ubda=$UMLHOSTFS \ \$SWITCH_${host} \ diff --git a/testing/scripts/xstart-umls b/testing/scripts/xstart-umls index b80323f47..8f9b6f490 100755 --- a/testing/scripts/xstart-umls +++ b/testing/scripts/xstart-umls @@ -63,7 +63,6 @@ do [ -f $UMLHOSTFS ] || die "!! uml root file system '$UMLHOSTFS' not found" cecho-n " * Starting ${host}.." - #eval xterm -title ${host} -geometry "+${x0}+${y0}" -rightbar -sb -sl 500 -e "gdb --args $UMLKERNEL \ eval xterm -title ${host} -geometry "+${x0}+${y0}" -rightbar -sb -sl 500 -e "$UMLKERNEL \ umid=${host} \ ubda=$UMLHOSTFS \ diff --git a/testing/testing.conf b/testing/testing.conf index b1fa1e91f..508897409 100755 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -17,7 +17,7 @@ # RCSID $Id$ # Root directory of testing -UMLTESTDIR=/home/strongswan-testing +UMLTESTDIR=~/strongswan-testing # Bzipped kernel sources # (file extension .tar.bz2 required) @@ -58,7 +58,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 @@ -75,13 +75,13 @@ TZUML="Europe/Zurich" # Enable particular steps in the make-testing and # start-testing scripts # -ENABLE_BUILD_UMLKERNEL="no" -ENABLE_BUILD_SSHKEYS="no" -ENABLE_BUILD_HOSTCONFIG="no" -ENABLE_BUILD_UMLROOTFS="yno" -ENABLE_BUILD_UMLHOSTFS="yno" -ENABLE_START_TESTING="no" -ENABLE_DO_TESTS="no" +ENABLE_BUILD_UMLKERNEL="yes" +ENABLE_BUILD_SSHKEYS="yes" +ENABLE_BUILD_HOSTCONFIG="yes" +ENABLE_BUILD_UMLROOTFS="yes" +ENABLE_BUILD_UMLHOSTFS="yes" +ENABLE_START_TESTING="yes" +ENABLE_DO_TESTS="yes" ENABLE_STOP_TESTING="no" ############################################################## @@ -92,7 +92,7 @@ ENABLE_STOP_TESTING="no" # Start the UML instance in a gnome-terminal (requires gnome) UMLSTARTMODE="gnome-terminal" # 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" @@ -117,7 +117,7 @@ HOSTNAMEIPV4="\ 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,10.1.0.30 \ +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 \ @@ -163,8 +163,7 @@ SWITCH_alice="eth0=daemon,fe:fd:0a:01:00:0a,unix,/tmp/umlswitch1 \ 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" -SWITCH_carol="eth0=daemon,fe:fd:c0:a8:00:64,unix,/tmp/umlswitch0 \ - eth1=daemon,fe:fd:0a:01:00:22,unix,/tmp/umlswitch1" +SWITCH_carol="eth0=daemon,fe:fd:c0:a8:00:64,unix,/tmp/umlswitch0" SWITCH_winnetou="eth0=daemon,fe:fd:c0:a8:00:96,unix,/tmp/umlswitch0" 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 \ |