diff options
| author | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2010-01-13 00:52:15 +0000 |
|---|---|---|
| committer | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2010-01-13 00:52:15 +0000 |
| commit | d38cad066f8351800c19d37c646d2ee6962258a4 (patch) | |
| tree | 65a2f463fababdaf8d7295555726356827050499 /regress | |
| parent | e95be89df4f3330fe2c83e74a68e7042daad9bbd (diff) | |
Remove random component of auto-generated table names in loaded rules.
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/sbin/pfctl/Makefile | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile index 235b11cd00e..cb72f701999 100644 --- a/regress/sbin/pfctl/Makefile +++ b/regress/sbin/pfctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.208 2009/09/24 11:04:10 jsg Exp $ +# $OpenBSD: Makefile,v 1.209 2010/01/13 00:52:14 mcbride Exp $ # TARGETS # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok @@ -124,13 +124,16 @@ PFLOAD_UPDATES+=pfload${n}-update pfload${n}: ${SUDO} pfctl -o none -a regress -f - < ${.CURDIR}/pf${n}.in - (${SUDO} pfctl -o none -a 'regress/*' -gvvsr) | \ + (${SUDO} pfctl -o none -a 'regress/*' -gvvsr | \ + sed -e 's/__automatic_[0-9a-f]*_/__automatic_/g' ) | \ diff -u ${.CURDIR}/pf${n}.loaded /dev/stdin ${SUDO} pfctl -o none -a regress -Fr >/dev/null 2>&1 pfload${n}-update: ${SUDO} pfctl -o none -a regress -f - < ${.CURDIR}/pf${n}.in - (${SUDO} pfctl -o none -a 'regress/*' -gvvsr) > ${.CURDIR}/pf${n}.loaded + (${SUDO} pfctl -o none -a 'regress/*' -gvvsr | \ + sed -e 's/__automatic_[0-9a-f]*_/__automatic_/g' ) \ + > ${.CURDIR}/pf${n}.loaded ${SUDO} pfctl -o none -a regress -Fr >/dev/null 2>&1 .endfor @@ -147,13 +150,16 @@ PFOPTIMIZE_UPDATES+=pfoptimize${n}-update pfoptimize${n}: ${SUDO} pfctl -obasic -a regress -f - < ${.CURDIR}/pf${n}.in - (${SUDO} pfctl -o none -a regress -gvvsr) | \ + (${SUDO} pfctl -o none -a regress -gvvsr | \ + sed -e 's/__automatic_[0-9a-f]*_/__automatic_/g') | \ diff -u ${.CURDIR}/pf${n}.optimized /dev/stdin ${SUDO} pfctl -o none -a regress -Fr >/dev/null 2>&1 pfoptimize${n}-update: ${SUDO} pfctl -obasic -a regress -f - < ${.CURDIR}/pf${n}.in - (${SUDO} pfctl -o none -a regress -gvvsr) > ${.CURDIR}/pf${n}.optimized + (${SUDO} pfctl -o none -a regress -gvvsr | \ + sed -e 's/__automatic_[0-9a-f]*_/__automatic_/g' ) \ + > ${.CURDIR}/pf${n}.optimized ${SUDO} pfctl -o none -a regress -Fr >/dev/null 2>&1 .endfor |