diff options
| -rw-r--r-- | regress/sys/net/gif/Makefile | 7 | ||||
| -rw-r--r-- | regress/sys/net/loop/Makefile | 7 | ||||
| -rw-r--r-- | regress/sys/net/pair/Makefile | 9 | ||||
| -rw-r--r-- | regress/sys/net/pf_opts/Makefile | 7 | ||||
| -rw-r--r-- | regress/sys/net/pflog/Makefile | 9 |
5 files changed, 22 insertions, 17 deletions
diff --git a/regress/sys/net/gif/Makefile b/regress/sys/net/gif/Makefile index 1d02c8df8a4..38440678ed3 100644 --- a/regress/sys/net/gif/Makefile +++ b/regress/sys/net/gif/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2022/04/29 17:27:37 bluhm Exp $ +# $OpenBSD: Makefile,v 1.8 2023/10/11 18:07:56 anton Exp $ # Copyright (c) 2018-2020 Alexander Bluhm <bluhm@openbsd.org> # @@ -68,8 +68,9 @@ regress: @echo Enable pf to run this regress. @echo SKIPPED .endif -PF_SKIP != ${SUDO} /sbin/pfctl -sI -v | sed -n 's/ (skip)//p' -.if ! empty(PF_SKIP:Mlo*:Nlo0) +PF_SKIP != ${SUDO} /sbin/pfctl -sI -v | sed -n 's/ (skip)//p' | \ + grep -w -e lo${N1} -e lo${N2} || : +.if ! empty(PF_SKIP) regress: @echo pf skip: "${PF_SKIP}" @echo Do not set skip on interface lo, lo${N1}, or lo${N2}. diff --git a/regress/sys/net/loop/Makefile b/regress/sys/net/loop/Makefile index 1b5e903a6f3..78ada09a6eb 100644 --- a/regress/sys/net/loop/Makefile +++ b/regress/sys/net/loop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2022/04/29 17:27:37 bluhm Exp $ +# $OpenBSD: Makefile,v 1.10 2023/10/11 18:07:56 anton Exp $ # Copyright (c) 2017-2020 Alexander Bluhm <bluhm@openbsd.org> # @@ -45,8 +45,9 @@ regress: @echo SKIPPED .endif -PF_SKIP != ${SUDO} /sbin/pfctl -sI -v | sed -n 's/ (skip)//p' -.if ! empty(PF_SKIP:Mlo*:Nlo0) +PF_SKIP != ${SUDO} /sbin/pfctl -sI -v | sed -n 's/ (skip)//p' | \ + grep -w -e lo${N1} -e lo${N2} || : +.if ! empty(PF_SKIP) regress: @echo pf skip: "${PF_SKIP}" @echo Do not set skip on interface lo, lo${N1}, or lo${N2}. diff --git a/regress/sys/net/pair/Makefile b/regress/sys/net/pair/Makefile index 64894fc75a3..502160e10d8 100644 --- a/regress/sys/net/pair/Makefile +++ b/regress/sys/net/pair/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2022/04/29 17:27:37 bluhm Exp $ +# $OpenBSD: Makefile,v 1.4 2023/10/11 18:07:56 anton Exp $ # Copyright (c) 2021 Alexander Bluhm <bluhm@openbsd.org> # @@ -60,11 +60,12 @@ regress: @echo SKIPPED .endif -PF_SKIP != ${SUDO} /sbin/pfctl -sI -v | sed -n 's/ (skip)//p' -.if ! empty(PF_SKIP:Mlo*:Nlo0) +PF_SKIP != ${SUDO} /sbin/pfctl -sI -v | sed -n 's/ (skip)//p' | \ + grep -w -e lo${N1} -e lo${N2} -e lo${N3} || : +.if ! empty(PF_SKIP) regress: @echo pf skip: "${PF_SKIP}" - @echo Do not set skip on interface lo or lo$N. + @echo Do not set skip on interface lo, lo${N1}, lo${N2} or lo${N3}. @echo SKIPPED .endif diff --git a/regress/sys/net/pf_opts/Makefile b/regress/sys/net/pf_opts/Makefile index ade0b5f48a6..e1b17209c88 100644 --- a/regress/sys/net/pf_opts/Makefile +++ b/regress/sys/net/pf_opts/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2022/05/16 16:54:18 bluhm Exp $ +# $OpenBSD: Makefile,v 1.7 2023/10/11 18:07:56 anton Exp $ # Copyright (c) 2022 Alexander Bluhm <bluhm@openbsd.org> # @@ -47,8 +47,9 @@ regress: @echo SKIPPED .endif -PF_SKIP != ${SUDO} /sbin/pfctl -sI -v | sed -n 's/ (skip)//p' -.if ! empty(PF_SKIP:Mlo*:Nlo0) +PF_SKIP != ${SUDO} /sbin/pfctl -sI -v | sed -n 's/ (skip)//p' | \ + grep -w -e lo${N1} -e lo${N2} || : +.if ! empty(PF_SKIP) regress: @echo pf skip: "${PF_SKIP}" @echo Do not set skip on interface lo, lo${N1}, or lo${N2}. diff --git a/regress/sys/net/pflog/Makefile b/regress/sys/net/pflog/Makefile index 4f833a930b6..b9989a22f9a 100644 --- a/regress/sys/net/pflog/Makefile +++ b/regress/sys/net/pflog/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2022/04/29 17:27:37 bluhm Exp $ +# $OpenBSD: Makefile,v 1.9 2023/10/11 18:07:56 anton Exp $ # Copyright (c) 2021 Alexander Bluhm <bluhm@openbsd.org> # @@ -41,11 +41,12 @@ regress: @echo SKIPPED .endif -PF_SKIP != ${SUDO} /sbin/pfctl -sI -v | sed -n 's/ (skip)//p' -.if ! empty(PF_SKIP:Mlo*:Nlo0) +PF_SKIP != ${SUDO} /sbin/pfctl -sI -v | sed -n 's/ (skip)//p' | \ + grep -w -e lo${N1} -e lo${N2} -e lo${N3} || : +.if ! empty(PF_SKIP) regress: @echo pf skip: "${PF_SKIP}" - @echo Do not set skip on interface lo or lo$N. + @echo Do not set skip on interface lo, lo${N1}, lo${N2}, or lo${N3}. @echo SKIPPED .endif |