summaryrefslogtreecommitdiff
path: root/regress/sbin
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2009-01-29 10:08:14 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2009-01-29 10:08:14 +0000
commit28ead018b3070b304d95f32322e59f30afccc163 (patch)
tree6516471aac0409bd0e17b6a742dbf797a5cf613f /regress/sbin
parent9f79d82cfaf3152a99a4362b30e224ea2f722154 (diff)
Remove ikefail10 ipsecctl regression test as it always fails. It
was expecting a certain parser error message. Accepting the ikefail10 config file is not considered to be a bug anymore. ok hshoexer@
Diffstat (limited to 'regress/sbin')
-rw-r--r--regress/sbin/ipsecctl/Makefile4
-rw-r--r--regress/sbin/ipsecctl/ikefail10.in6
-rw-r--r--regress/sbin/ipsecctl/ikefail10.ok4
3 files changed, 2 insertions, 12 deletions
diff --git a/regress/sbin/ipsecctl/Makefile b/regress/sbin/ipsecctl/Makefile
index 033906db91c..b860c2ee0d2 100644
--- a/regress/sbin/ipsecctl/Makefile
+++ b/regress/sbin/ipsecctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2009/01/28 18:07:19 bluhm Exp $
+# $OpenBSD: Makefile,v 1.55 2009/01/29 10:08:13 bluhm Exp $
# you can update the *.ok files with: make -i | patch
# TARGETS
@@ -15,7 +15,7 @@ TCPMD5TESTS=1 2 3
SATESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
SAFAIL=1 2
IPSECFAIL=1 2 3
-IKEFAIL=1 3 4 5 6 8 9 10 11 12 13
+IKEFAIL=1 3 4 5 6 8 9 11 12 13
IKETESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
IKETESTS+=16 17 18 19 20 21 22 23
IKETESTS+=29 30 31 32 33 34 35 36 37 38 39 40
diff --git a/regress/sbin/ipsecctl/ikefail10.in b/regress/sbin/ipsecctl/ikefail10.in
deleted file mode 100644
index eab39a65be0..00000000000
--- a/regress/sbin/ipsecctl/ikefail10.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# missing closing quote in line 4
-remote_gw = "192.168.0.1"
-remote_net = "{ 10.0.100.0/22, 10.0.2/24 }"
-local_net = "{ 172.16.18.0/26 }
-
-ike esp from $local_net to $remote_net peer $remote_gw psk "test123"
diff --git a/regress/sbin/ipsecctl/ikefail10.ok b/regress/sbin/ipsecctl/ikefail10.ok
deleted file mode 100644
index 8ae61940a38..00000000000
--- a/regress/sbin/ipsecctl/ikefail10.ok
+++ /dev/null
@@ -1,4 +0,0 @@
-stdin: 4: syntax error
-ipsecctl: Syntax error in config file: ipsec rules not loaded
-remote_gw = "192.168.0.1"
-remote_net = "{ 10.0.100.0/22, 10.0.2/24 }"