Use qemu/KVM virtualization instead of UML

[strongswan.git] / testing / make-testing

diff --git a/testing/make-testing b/testing/make-testing
index 89a3db1..3739299 100755 (executable)
--- a/testing/make-testing
+++ b/testing/make-testing
@@ -1,77 +1,25 @@
 #!/bin/bash
 #!/bin/bash

-# Create the strongSwan UML testing environment
-#
-# Copyright (C) 2004  Eric Marchionni, Patrik Rayo
-# Zuercher Hochschule Winterthur
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.

 
 

-DIR=`dirname $0`
+. $PWD/scripts/function.sh

 
 

-source $DIR/scripts/function.sh
-
-[ -f $DIR/testing.conf ] || die "!! Configuration file 'testing.conf' not found."
-
-source $DIR/testing.conf

 rm -f $LOGFILE
 
 rm -f $LOGFILE
 

-if [ "$#" -eq 0 ]
-then
-    HOSTS=$STRONGSWANHOSTS
-else
-    HOSTS=$*
-fi
-
-##########################################################################
-# build base image
-#

 if [ $ENABLE_BUILD_BASEIMAGE = "yes" ]
 then
 if [ $ENABLE_BUILD_BASEIMAGE = "yes" ]
 then

-   $DIR/scripts/build-baseimage
+       $PWD/scripts/build-baseimage

 fi
 
 fi
 

-
-##########################################################################
-# build the UML kernel based on a vanilla kernel form kernel.org
-# and a matching UML patch from user-mode-linux.sourceforge.net
-#
-if [ $ENABLE_BUILD_UMLKERNEL = "yes" ]
+if [ $ENABLE_BUILD_GUESTKERNEL = "yes" ]

 then
 then

-   $DIR/scripts/build-umlkernel
+       $PWD/scripts/build-guestkernel

 fi
 
 fi
 

-##########################################################################
-# build a generic UML root file system based on a Gentoo root file system.
-# compile and install a specified strongSwan release into the file system.
-#

 if [ $ENABLE_BUILD_UMLROOTFS = "yes" ]
 then
 if [ $ENABLE_BUILD_UMLROOTFS = "yes" ]
 then

-   $DIR/scripts/build-umlrootfs
-fi
-
-##########################################################################
-# copy the default UML host configurations to $BUILDDIR
-# and assign actual IP addresses to the UML hosts
-#
-if [ $ENABLE_BUILD_HOSTCONFIG = "yes" ]
-then
-   cecho "Building host configurations (scripts/build-hostconfig)"
-   $DIR/scripts/build-hostconfig
+       $PWD/scripts/build-umlrootfs

 fi
 
 fi
 

-##########################################################################
-# Creating the root filesystems for the specified UML instances
-#

 if [ $ENABLE_BUILD_UMLHOSTFS = "yes" ]
 then
 if [ $ENABLE_BUILD_UMLHOSTFS = "yes" ]
 then

-   cecho "Building uml host images (scripts/build-umlhostfs)"
-   $DIR/scripts/build-umlhostfs $HOSTS
+       $PWD/scripts/build-umlhostfs $HOSTS

 fi
 fi