merged EAP framework from branch into trunk

includes a lot of other modifications

testing/start-testing

@@ -47,6 +47,10 @@ case $UMLSTARTMODE in
 	cecho "Start the uml instances  (scripts/kstart-umls)"
 	$DIR/scripts/kstart-umls $HOSTS
 	;;
+    gnome-terminal)
+	cecho "Start the uml instances  (scripts/gstart-umls)"
+	$DIR/scripts/gstart-umls $HOSTS
+	;;
     xterm)
 	cecho "Start the uml instances  (scripts/xstart-umls)"
 	$DIR/scripts/xstart-umls $HOSTS

testing/testing.conf

@@ -17,7 +17,7 @@
 # RCSID $Id: testing.conf,v 1.52 2006/04/24 16:58:03 as Exp $
 
 # Root directory of testing
-UMLTESTDIR=~/strongswan-testing
+UMLTESTDIR=/home/strongswan-testing
 
 # Bzipped kernel sources
 # (file extension .tar.bz2 required)
@@ -49,13 +49,13 @@ ROOTFSSIZE=544
 # Amount of Memory to use per UML [MB].
 # If "auto" is stated 1/12 of total host ram will be used.
 # Examples: MEM=64, MEM="128", MEM="auto"
-MEM=64
+MEM=96
 
 # Directory where the UML kernels and file system will be built
 BUILDDIR=$UMLTESTDIR/umlbuild
 
 # Filename of the built UML Kernel
-UMLKERNEL=$BUILDDIR/linux-uml-$KERNELVERSION
+UMLKERNEL=$UMLTESTDIR/linux
 
 # Directory where test results will be stored
 TESTRESULTSDIR=$UMLTESTDIR/testresults
@@ -63,7 +63,7 @@ TESTRESULTSDIR=$UMLTESTDIR/testresults
 # Path to a full strongswan tree on the host system, which is
 # mounted into /root/strongswan-shared. This gives us an easy
 # way to apply and test changes instantly.
-#SHAREDTREE=/home/mwilli/strongswan/trunk
+SHAREDTREE=/home/martin/strongswan/trunk
 
 # Timezone for the UMLs, look in /usr/share/zoneinfo!
 TZUML="Europe/Zurich"
@@ -72,22 +72,22 @@ TZUML="Europe/Zurich"
 # Enable particular steps in the make-testing and
 # start-testing scripts
 #
-ENABLE_BUILD_UMLKERNEL="yes"
+ENABLE_BUILD_UMLKERNEL="no"
 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_START_TESTING="no"
+ENABLE_DO_TESTS="no"
 ENABLE_STOP_TESTING="no"
 
 ##############################################################
 # How to start the UMLs?
 #
 # Start the UML instance in KDE konsole (requires KDE)
-UMLSTARTMODE="konsole"
+#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"
@@ -100,7 +100,7 @@ SELECTEDTESTSONLY="no"
 
 # Tests to do if $SELECTEDTESTSONLY is set "yes".
 #
-SELECTEDTESTS="net2net-cert"
+SELECTEDTESTS="ikev2-net2net ikev2-rw"
 
 ##############################################################
 # hostname and corresponding IPv4 and IPv6 addresses