diff options
| author | Kjell Wooding <kjell@cvs.openbsd.org> | 2002-06-11 02:16:31 +0000 |
|---|---|---|
| committer | Kjell Wooding <kjell@cvs.openbsd.org> | 2002-06-11 02:16:31 +0000 |
| commit | 09dfe6b2f21192026183f678eb93a83ab47f10dd (patch) | |
| tree | 328d584b172760b7da4a86cc49b51915e918286e /regress/sbin/pfctl/Makefile | |
| parent | a74d174ebe7d9d4fe9d2e8e044766a2230f8db17 (diff) | |
Use merged config file format. The separate NAT loop can go away,
since all files are now loaded the same way. Add regress tests for
invalid ordering of scrub, nat, filter rules
Diffstat (limited to 'regress/sbin/pfctl/Makefile')
| -rw-r--r-- | regress/sbin/pfctl/Makefile | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile index 10839ae3377..f51e65fb9cc 100644 --- a/regress/sbin/pfctl/Makefile +++ b/regress/sbin/pfctl/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.17 2002/06/10 02:10:39 kjell Exp $ +# $OpenBSD: Makefile,v 1.18 2002/06/11 02:16:30 kjell Exp $ -PFTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 -PFFAIL=1 2 3 4 5 6 7 8 +PFTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 +PFFAIL=1 2 3 4 5 6 7 8 9 10 .for n in ${PFFAIL} REGRESSTARGETS+=pfail${n} pfail${n}: - if pfctl -nv -R - < ${.CURDIR}/pfail${n}.in > /dev/null 2>&1 ; then \ + if pfctl -nv -f - < ${.CURDIR}/pfail${n}.in > /dev/null 2>&1 ; then \ false ; \ fi @@ -17,22 +17,11 @@ pfail${n}: REGRESSTARGETS+=pf${n} pf${n}: - pfctl -nv -R - < ${.CURDIR}/pf${n}.in | \ + pfctl -nv -f - < ${.CURDIR}/pf${n}.in | \ cmp -s ${.CURDIR}/pf${n}.ok /dev/stdin .endfor -NATTESTS=binat1 nat1 rdr1 - -.for n in ${NATTESTS} -REGRESSTARGETS+=${n} - -${n}: - pfctl -nv -N - < ${.CURDIR}/${n}.in | \ - cmp -s ${.CURDIR}/${n}.ok /dev/stdin - -.endfor - .PHONY: ${REGRESSTARGETS} .include <bsd.regress.mk> |