Remove some tests that are no longer relevant with the new pf.

ok henning@

9 files changed, 3 insertions, 50 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index f363b34412c..235b11cd00e 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.207 2009/09/03 12:38:32 jsg Exp $
+# $OpenBSD: Makefile,v 1.208 2009/09/24 11:04:10 jsg Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -16,8 +16,8 @@ PFTESTS+=28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
 PFTESTS+=51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
 PFTESTS+=74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
 PFTESTS+=97 98
-PFFAIL=1 2 3 4 5 6 7 8 11 12 13 14 15 16 17 18 19 20 23 24 25 27
-PFFAIL+=28 29 30 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
+PFFAIL=1 2 3 4 5 6 7 8 11 12 13 14 15 16 17 18 19 20 23 25 27
+PFFAIL+=29 30 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 52 53
 PFSIMPLE=1 2
 PFSETUP=1 2 3 4
 PFLOAD=1 2 3 4 5 7 8 9 10 11 12 13 14 15 16 17 18 19 20 23 24 25 26 27 28 29
diff --git a/regress/sbin/pfctl/pfail24.in b/regress/sbin/pfctl/pfail24.in
deleted file mode 100644
index dea06b53d9e..00000000000
--- a/regress/sbin/pfctl/pfail24.in
+++ /dev/null
@@ -1,11 +0,0 @@
-rdr-anchor test1 proto udp from port 80 to any
-rdr-anchor test2 proto udp to port { 80, 22 }
-rdr-anchor test3 proto tcp from port www 
-rdr-anchor test4 proto tcp from any to port { www, ssh }
-rdr-anchor test5 proto udp to port != 80
-rdr-anchor test6 proto tcp from any to port >= ssh
-binat-anchor test7 proto { tcp, udp } 
-binat-anchor test8 from 127.0.0.1 to any
-binat-anchor test9 to localhost 
-binat-anchor test10 from any port 23 to any
-binat-anchor test11 from any to port { telnet, ssh }
diff --git a/regress/sbin/pfctl/pfail24.ok b/regress/sbin/pfctl/pfail24.ok
deleted file mode 100644
index a7a8b98d28d..00000000000
--- a/regress/sbin/pfctl/pfail24.ok
+++ /dev/null
@@ -1,11 +0,0 @@
-stdin:1: source port parameter not supported in rdr-anchor
-stdin:2: destination port list expansion not supported in rdr-anchor
-stdin:3: source port parameter not supported in rdr-anchor
-stdin:4: destination port list expansion not supported in rdr-anchor
-stdin:5: destination port operators not supported in rdr-anchor
-stdin:6: destination port operators not supported in rdr-anchor
-stdin:7: proto list expansion not supported in binat-anchor
-stdin:8: fromto parameter not supported in binat-anchor
-stdin:9: fromto parameter not supported in binat-anchor
-stdin:10: fromto parameter not supported in binat-anchor
-stdin:11: fromto parameter not supported in binat-anchor
diff --git a/regress/sbin/pfctl/pfail26.in b/regress/sbin/pfctl/pfail26.in
deleted file mode 100644
index 8d2e0912919..00000000000
--- a/regress/sbin/pfctl/pfail26.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# anchorname too long
-
-rdr-anchor too-long-anchor1
-nat-anchor too-long-anchor2
-binat-anchor too-long-anchor3
-anchor too-long-anchor4
-
diff --git a/regress/sbin/pfctl/pfail26.ok b/regress/sbin/pfctl/pfail26.ok
deleted file mode 100644
index b8a9fe4fae8..00000000000
--- a/regress/sbin/pfctl/pfail26.ok
+++ /dev/null
@@ -1,4 +0,0 @@
-stdin:3: anchor name 'too-long-anchor1' too long
-stdin:4: anchor name 'too-long-anchor2' too long
-stdin:5: anchor name 'too-long-anchor3' too long
-stdin:6: anchor name 'too-long-anchor4' too long
diff --git a/regress/sbin/pfctl/pfail28.in b/regress/sbin/pfctl/pfail28.in
deleted file mode 100644
index ee384425563..00000000000
--- a/regress/sbin/pfctl/pfail28.in
+++ /dev/null
@@ -1,4 +0,0 @@
-# binat-anchor limits
-
-binat-anchor foo proto { tcp udp } all
-binat-anchor foo from 10/8
diff --git a/regress/sbin/pfctl/pfail28.ok b/regress/sbin/pfctl/pfail28.ok
deleted file mode 100644
index 95d9ac74579..00000000000
--- a/regress/sbin/pfctl/pfail28.ok
+++ /dev/null
@@ -1,2 +0,0 @@
-stdin:3: proto list expansion not supported in binat-anchor
-stdin:4: fromto parameter not supported in binat-anchor
diff --git a/regress/sbin/pfctl/pfail51.in b/regress/sbin/pfctl/pfail51.in
deleted file mode 100644
index 3e5daf74c03..00000000000
--- a/regress/sbin/pfctl/pfail51.in
+++ /dev/null
@@ -1,4 +0,0 @@
-no nat pass all -> 127.0.0.1
-no rdr pass all -> 127.0.0.1
-no binat pass from 10/8 to 11/8 -> 12/8
-no binat pass log from 10/8 to 11/8 -> 12/8
diff --git a/regress/sbin/pfctl/pfail51.ok b/regress/sbin/pfctl/pfail51.ok
deleted file mode 100644
index f73c5b2361f..00000000000
--- a/regress/sbin/pfctl/pfail51.ok
+++ /dev/null
@@ -1,4 +0,0 @@
-stdin:1: "pass" not valid with "no"
-stdin:2: "pass" not valid with "no"
-stdin:3: "pass" not valid with "no"
-stdin:4: "pass" not valid with "no"