aboutsummaryrefslogtreecommitdiffstats
path: root/testing/tests/ikev2/net2net-pgp-v3/test.conf
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2013-01-17 17:00:05 +0100
committerTobias Brunner <tobias@strongswan.org>2013-01-17 17:00:05 +0100
commit0c006341f3789477c429cdfb547ad5ec59819bbf (patch)
treeb11eda6dc752549be59cc5406887ae4b404e4aa8 /testing/tests/ikev2/net2net-pgp-v3/test.conf
parent1449e6dd55892c92e502a14dbfc3ede094aaa806 (diff)
parent737912239f625dcfa1c26924430d8ceb033184dd (diff)
downloadstrongswan-0c006341f3789477c429cdfb547ad5ec59819bbf.tar.bz2
strongswan-0c006341f3789477c429cdfb547ad5ec59819bbf.tar.xz
Merge branch 'debian-testing'
These changes update the integration test system. It previously was based on a pretty much unmaintainable Gentoo root image and the dated UML virtualization technology. Among many other changes the test environment is now based on KVM and uses reproducible Debian-based guest images. Conflicts: NEWS
Diffstat (limited to 'testing/tests/ikev2/net2net-pgp-v3/test.conf')
-rw-r--r--testing/tests/ikev2/net2net-pgp-v3/test.conf10
1 files changed, 5 insertions, 5 deletions
diff --git a/testing/tests/ikev2/net2net-pgp-v3/test.conf b/testing/tests/ikev2/net2net-pgp-v3/test.conf
index f74d0f7d6..afa2accbe 100644
--- a/testing/tests/ikev2/net2net-pgp-v3/test.conf
+++ b/testing/tests/ikev2/net2net-pgp-v3/test.conf
@@ -1,21 +1,21 @@
#!/bin/bash
#
# This configuration file provides information on the
-# UML instances used for this test
+# guest instances used for this test
-# All UML instances that are required for this test
+# All guest instances that are required for this test
#
-UMLHOSTS="alice moon winnetou sun bob"
+VIRTHOSTS="alice moon winnetou sun bob"
# Corresponding block diagram
#
DIAGRAM="a-m-w-s-b.png"
-# UML instances on which tcpdump is to be started
+# Guest instances on which tcpdump is to be started
#
TCPDUMPHOSTS="sun"
-# UML instances on which IPsec is started
+# Guest instances on which IPsec is started
# Used for IPsec logging purposes
#
IPSECHOSTS="moon sun"