From 88db0b911167d5e5a3225590459c47204e3de69b Mon Sep 17 00:00:00 2001 From: Claudio Jeker Date: Mon, 28 Oct 2024 12:11:06 +0000 Subject: Remove unnecessary pfctl cleanup in error_notify() --- regress/usr.sbin/bgpd/integrationtests/ixp.sh | 3 +-- regress/usr.sbin/bgpd/integrationtests/l3vpn.sh | 3 +-- regress/usr.sbin/bgpd/integrationtests/lladdr.sh | 3 +-- regress/usr.sbin/bgpd/integrationtests/maxattr.sh | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/regress/usr.sbin/bgpd/integrationtests/ixp.sh b/regress/usr.sbin/bgpd/integrationtests/ixp.sh index 8779285019a..c07c04e56dc 100644 --- a/regress/usr.sbin/bgpd/integrationtests/ixp.sh +++ b/regress/usr.sbin/bgpd/integrationtests/ixp.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: ixp.sh,v 1.2 2024/01/28 12:36:21 anton Exp $ +# $OpenBSD: ixp.sh,v 1.3 2024/10/28 12:11:05 claudio Exp $ set -e @@ -20,7 +20,6 @@ PAIR2IP4=192.0.2.41 error_notify() { echo cleanup - pfctl -q -t bgpd_integ_test -T kill pkill -T ${RDOMAIN1} bgpd || true pkill -T ${RDOMAIN2} bgpd || true sleep 1 diff --git a/regress/usr.sbin/bgpd/integrationtests/l3vpn.sh b/regress/usr.sbin/bgpd/integrationtests/l3vpn.sh index d41752c98bd..d290ce6e143 100644 --- a/regress/usr.sbin/bgpd/integrationtests/l3vpn.sh +++ b/regress/usr.sbin/bgpd/integrationtests/l3vpn.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: l3vpn.sh,v 1.5 2024/10/28 12:06:14 claudio Exp $ +# $OpenBSD: l3vpn.sh,v 1.6 2024/10/28 12:11:05 claudio Exp $ set -e @@ -22,7 +22,6 @@ PAIR2IP6=2001:db8:57::2 error_notify() { set -x echo cleanup - pfctl -q -t bgpd_integ_test -T kill pkill -T ${RDOMAIN1} bgpd || true pkill -T ${RDOMAIN2} bgpd || true sleep 1 diff --git a/regress/usr.sbin/bgpd/integrationtests/lladdr.sh b/regress/usr.sbin/bgpd/integrationtests/lladdr.sh index 0391c52a556..ad672a1df8e 100644 --- a/regress/usr.sbin/bgpd/integrationtests/lladdr.sh +++ b/regress/usr.sbin/bgpd/integrationtests/lladdr.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: lladdr.sh,v 1.2 2023/10/16 12:49:15 claudio Exp $ +# $OpenBSD: lladdr.sh,v 1.3 2024/10/28 12:11:05 claudio Exp $ set -e @@ -22,7 +22,6 @@ GIF2IP6=fe80::beef:2 error_notify() { set -x echo cleanup - pfctl -q -t bgpd_integ_test -T kill pkill -T ${RDOMAIN1} bgpd || true pkill -T ${RDOMAIN2} bgpd || true sleep 1 diff --git a/regress/usr.sbin/bgpd/integrationtests/maxattr.sh b/regress/usr.sbin/bgpd/integrationtests/maxattr.sh index b55d51a8ae8..49c649ecf20 100644 --- a/regress/usr.sbin/bgpd/integrationtests/maxattr.sh +++ b/regress/usr.sbin/bgpd/integrationtests/maxattr.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: maxattr.sh,v 1.3 2024/09/26 08:12:30 claudio Exp $ +# $OpenBSD: maxattr.sh,v 1.4 2024/10/28 12:11:05 claudio Exp $ set -e @@ -21,7 +21,6 @@ PAIR2IP6_2=2001:db8:57::3 error_notify() { echo cleanup - pfctl -q -t bgpd_integ_test -T kill pkill -T ${RDOMAIN1} bgpd || true pkill -T ${RDOMAIN2} bgpd || true sleep 1 -- cgit v1.2.3