summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Pfatschbacher <mpf@cvs.openbsd.org>2007-09-19 22:45:05 +0000
committerMarco Pfatschbacher <mpf@cvs.openbsd.org>2007-09-19 22:45:05 +0000
commit9b25d264b12c1dae43c84ade0563d93fee3f2e14 (patch)
treef8e37ce2f8df693816ecd2d8092f7fd1288e546a
parent962005787163ee55cf8524f03e2cd6572d7db3ae (diff)
Fix and re-enable tests for interface->address translation.
OK henning
-rw-r--r--regress/sbin/pfctl/Makefile8
-rw-r--r--regress/sbin/pfctl/if2ip4
2 files changed, 6 insertions, 6 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index afd0cc7512a..804caac5959 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.197 2007/08/30 12:24:28 dhartmei Exp $
+# $OpenBSD: Makefile,v 1.198 2007/09/19 22:45:04 mpf Exp $
# TARGETS
# pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -202,9 +202,9 @@ pfi${n}-update:
pfi: ${PFI_TARGETS}
pfi-update: ${PFI_UPDATES}
-# REGRESS_TARGETS+=pfi
-# REGRESS_ROOT_TARGETS+=pfi
-# UPDATE_TARGETS+=pfi-update
+REGRESS_TARGETS+=pfi
+REGRESS_ROOT_TARGETS+=pfi
+UPDATE_TARGETS+=pfi-update
.for n in ${PFOPT}
PFOPT_TARGETS+=pfopt${n}
diff --git a/regress/sbin/pfctl/if2ip b/regress/sbin/pfctl/if2ip
index fdf86cd30c2..0b9236ef61c 100644
--- a/regress/sbin/pfctl/if2ip
+++ b/regress/sbin/pfctl/if2ip
@@ -17,10 +17,10 @@ kernel_spec() {
}
if2ip_kernel() {
- T=`echo "pass in on tun100 from $1" | pfctl -a _regress/if2ip -f- \
+ T=`echo "pass in on tun100 from $1" | pfctl -a regress/if2ip -f- \
-vf- | awk '{ print $6}' | tr -d "()"`
pfctl -a _pf -t "$T" -Ts | sort
- pfctl -a _regress/if2ip -qFr
+ pfctl -a regress/if2ip -qFr
}
while [ "X$1" != "X" ]; do