Add missing removal of network interfaces in regress cleanup targets.

Reducing the risk tests conflicting with each other.

ok bluhm@

diff --git a/regress/sbin/route/Makefile b/regress/sbin/route/Makefile
index 1a97808..1f64ec0 100644 (file)
--- a/regress/sbin/route/Makefile
+++ b/regress/sbin/route/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2019/03/30 06:37:10 yasuoka Exp $
+# $OpenBSD: Makefile,v 1.33 2023/10/19 18:36:40 anton Exp $
 
 ROUTE?=                /sbin/route
 RDOMAIN?=      5
@@ -21,7 +21,7 @@ RDOMAIN?=     5
        -${SUDO} ifconfig lo10004 up rdomain ${RDOMAIN} 192.0.2.4/32
 
 .END:
-.for itf in lo10001 lo10002 lo10003 lo10004 vlan99 vether99
+.for itf in lo10001 lo10002 lo10003 lo10004 vlan99 vether99 lo${RDOMAIN}
        -${SUDO} ifconfig ${itf} destroy 2>/dev/null || true
 .endfor
 

diff --git a/regress/sbin/slaacd/Makefile b/regress/sbin/slaacd/Makefile
index fbc12c1..3477dcf 100644 (file)
--- a/regress/sbin/slaacd/Makefile
+++ b/regress/sbin/slaacd/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.10 2020/12/30 21:40:32 kn Exp $
+#      $OpenBSD: Makefile,v 1.11 2023/10/19 18:36:40 anton Exp $
 
 # The following ports must be installed:
 #
@@ -54,7 +54,7 @@ setup: cleanup
 
 REGRESS_CLEANUP +=     cleanup
 cleanup:
-.for iface in ${PAIR1} ${PAIR2}
+.for iface in ${PAIR1} ${PAIR2} lo${RTABLE}
        ${SUDO} ifconfig ${iface} destroy 2>/dev/null || true
 .endfor
 

diff --git a/regress/sys/net/etherip/Makefile b/regress/sys/net/etherip/Makefile
index 61c8369..5eb7f17 100644 (file)
--- a/regress/sys/net/etherip/Makefile
+++ b/regress/sys/net/etherip/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.7 2020/12/17 00:39:42 bluhm Exp $
+#      $OpenBSD: Makefile,v 1.8 2023/10/19 18:36:40 anton Exp $
 
 # Copyright (c) 2017 Alexander Bluhm <bluhm@openbsd.org>
 # Copyright (c) 2015 Vincent Gross <vgross@openbsd.org>
@@ -82,6 +82,8 @@ unconfig:
        -${SUDO} /sbin/ifconfig $i$n destroy
 .endfor
 .endfor
+       -${SUDO} /sbin/ifconfig lo${N1} destroy
+       -${SUDO} /sbin/ifconfig lo${N2} destroy
        rm -f stamp-ifconfig
 
 REGRESS_TARGETS +=     run-ping-1-2

diff --git a/regress/sys/net/gif/Makefile b/regress/sys/net/gif/Makefile
index 3844067..0496231 100644 (file)
--- a/regress/sys/net/gif/Makefile
+++ b/regress/sys/net/gif/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.8 2023/10/11 18:07:56 anton Exp $
+#      $OpenBSD: Makefile,v 1.9 2023/10/19 18:36:40 anton Exp $
 
 # Copyright (c) 2018-2020 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -140,7 +140,6 @@ ifconfig: unconfig
 
 REGRESS_CLEANUP +=     unconfig
 unconfig:
-       # Destroy interfaces, keep lo as routing domain cannot be destroyed.
 .for n in ${NUMS}
        -${SUDO} /sbin/ifconfig lo$n rdomain $n
        -${SUDO} /sbin/ifconfig lo$n inet 127.0.0.1 delete
@@ -149,6 +148,7 @@ unconfig:
        -${SUDO} /sbin/ifconfig lo$n inet6 ${SRC_TUNNEL6_$n} delete
        -${SUDO} /sbin/ifconfig gif$n4 destroy
        -${SUDO} /sbin/ifconfig gif$n6 destroy
+       -${SUDO} /sbin/ifconfig lo$n destroy
 .endfor
        rm -f stamp-ifconfig
 

diff --git a/regress/sys/net/loop/Makefile b/regress/sys/net/loop/Makefile
index 78ada09..b34b1fb 100644 (file)
--- a/regress/sys/net/loop/Makefile
+++ b/regress/sys/net/loop/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.10 2023/10/11 18:07:56 anton Exp $
+#      $OpenBSD: Makefile,v 1.11 2023/10/19 18:36:40 anton Exp $
 
 # Copyright (c) 2017-2020 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -105,6 +105,7 @@ unconfig: stamp-stop
        -${SUDO} /sbin/ifconfig lo$n rdomain $n
        -${SUDO} /sbin/ifconfig lo$n inet 127.0.0.1 delete
        -${SUDO} /sbin/ifconfig lo$n inet 127.0.0.$n delete
+       -${SUDO} /sbin/ifconfig lo$n destroy
 .endfor
        rm -f stamp-ifconfig
 

diff --git a/regress/sys/net/pair/Makefile b/regress/sys/net/pair/Makefile
index 502160e..992c464 100644 (file)
--- a/regress/sys/net/pair/Makefile
+++ b/regress/sys/net/pair/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.4 2023/10/11 18:07:56 anton Exp $
+#      $OpenBSD: Makefile,v 1.5 2023/10/19 18:36:40 anton Exp $
 
 # Copyright (c) 2021 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -130,6 +130,7 @@ unconfig:
        -${SUDO} /sbin/route -n -T $n delete -inet6 fc00::/48
        -${SUDO} /sbin/ifconfig lo$n inet 127.0.0.1 delete
        -${SUDO} /sbin/ifconfig lo$n inet6 ::1 delete
+       -${SUDO} /sbin/ifconfig lo$n destroy
 .endfor
        rm -f stamp-ifconfig
 

diff --git a/regress/sys/net/pflog/Makefile b/regress/sys/net/pflog/Makefile
index b9989a2..6484682 100644 (file)
--- a/regress/sys/net/pflog/Makefile
+++ b/regress/sys/net/pflog/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.9 2023/10/11 18:07:56 anton Exp $
+#      $OpenBSD: Makefile,v 1.10 2023/10/19 18:36:40 anton Exp $
 
 # Copyright (c) 2021 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -114,6 +114,7 @@ unconfig: stamp-stop
 .for n in ${NUMS}
        -${SUDO} /sbin/ifconfig pflog$n destroy
 .endfor
+       -${SUDO} /sbin/ifconfig lo$N destroy
        rm -f stamp-ifconfig
 
 addr.py: Makefile

diff --git a/regress/sys/net/rdomains/ifalocal.sh b/regress/sys/net/rdomains/ifalocal.sh
index 16ef763..5d1c34d 100644 (file)
--- a/regress/sys/net/rdomains/ifalocal.sh
+++ b/regress/sys/net/rdomains/ifalocal.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: ifalocal.sh,v 1.1 2015/10/26 08:04:10 vgross Exp $
+#      $OpenBSD: ifalocal.sh,v 1.2 2023/10/19 18:36:41 anton Exp $
 
 # Copyright (c) 2015 Vincent Gross <vgross@openbsd.org>
 #
@@ -51,6 +51,8 @@ cleanup()
        ifconfig vether4 destroy
        route -T 3 flush
        ifconfig vether3 destroy
+       ifconfig lo5 destroy
+       ifconfig lo3 destroy
 }
 
 cleanup_and_die()

diff --git a/regress/sys/net/vxlan/vxlan_1.sh b/regress/sys/net/vxlan/vxlan_1.sh
index eef41c5..bd07ed2 100644 (file)
--- a/regress/sys/net/vxlan/vxlan_1.sh
+++ b/regress/sys/net/vxlan/vxlan_1.sh
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#      $OpenBSD: vxlan_1.sh,v 1.1 2016/10/07 02:06:57 yasuoka Exp $
+#      $OpenBSD: vxlan_1.sh,v 1.2 2023/10/19 18:36:41 anton Exp $
 
 
 cleanup()
@@ -7,6 +7,9 @@ cleanup()
        for if in $ALL_IFS; do
                ifconfig $if destroy 2>/dev/null
        done
+       for id in $RDOMAINS; do
+               ifconfig lo$id destroy 2>/dev/null
+       done
 }
 
 CURDIR=$(cd $(dirname $0); pwd)

diff --git a/regress/sys/net/vxlan/vxlan_2.sh b/regress/sys/net/vxlan/vxlan_2.sh
index b4ed272..6b98060 100644 (file)
--- a/regress/sys/net/vxlan/vxlan_2.sh
+++ b/regress/sys/net/vxlan/vxlan_2.sh
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#      $Id: vxlan_2.sh,v 1.3 2022/02/21 00:36:22 dlg Exp $
+#      $Id: vxlan_2.sh,v 1.4 2023/10/19 18:36:41 anton Exp $
 
 
 CAPFILE=$(mktemp -t regress_vxlan.XXXXXXX)
@@ -143,6 +143,11 @@ done
 
 CLEANUP_IFS="bridge$VNETID $CLEANUP_IFS"
 
+for id in $RDOMAINS; do
+       CLEANUP_IFS="$CLEANUP_IFS lo${id}"
+done
+CLEANUP_IFS="$CLEANUP_IFS lo${VNETID}"
+
 STATUS=0
 
 test_inet $RDOMAINS

diff --git a/regress/sys/netinet/carp/carp_1.sh b/regress/sys/netinet/carp/carp_1.sh
index 8aab39a..76cf607 100644 (file)
--- a/regress/sys/netinet/carp/carp_1.sh
+++ b/regress/sys/netinet/carp/carp_1.sh
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#      $OpenBSD: carp_1.sh,v 1.1 2016/10/24 02:52:02 yasuoka Exp $
+#      $OpenBSD: carp_1.sh,v 1.2 2023/10/19 18:36:41 anton Exp $
 
 
 cleanup()
@@ -7,6 +7,9 @@ cleanup()
        for if in $ALL_IFS; do
                ifconfig $if destroy 2>/dev/null
        done
+       for i in $RDOMAINS; do
+               ifconfig lo$i destroy 2>/dev/null
+       done
 }
 
 CURDIR=$(cd $(dirname $0); pwd)

diff --git a/regress/sys/netinet/carp/carp_2.sh b/regress/sys/netinet/carp/carp_2.sh
index 6b607e5..2cd53f0 100644 (file)
--- a/regress/sys/netinet/carp/carp_2.sh
+++ b/regress/sys/netinet/carp/carp_2.sh
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#      $OpenBSD: carp_2.sh,v 1.1 2016/10/24 02:52:02 yasuoka Exp $
+#      $OpenBSD: carp_2.sh,v 1.2 2023/10/19 18:36:41 anton Exp $
 
 
 cleanup()
@@ -7,6 +7,9 @@ cleanup()
        for if in $ALL_IFS; do
                ifconfig $if destroy 2>/dev/null
        done
+       for i in $RDOMAINS; do
+               ifconfig lo$i destroy 2>/dev/null
+       done
 }
 
 CURDIR=$(cd $(dirname $0); pwd)

diff --git a/regress/sys/netinet/carp/carp_3.sh b/regress/sys/netinet/carp/carp_3.sh
index 949b5fd..3b2dc2c 100644 (file)
--- a/regress/sys/netinet/carp/carp_3.sh
+++ b/regress/sys/netinet/carp/carp_3.sh
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#      $OpenBSD: carp_3.sh,v 1.1 2016/10/24 02:52:02 yasuoka Exp $
+#      $OpenBSD: carp_3.sh,v 1.2 2023/10/19 18:36:41 anton Exp $
 
 
 cleanup()
@@ -7,6 +7,9 @@ cleanup()
        for if in $ALL_IFS; do
                ifconfig $if destroy 2>/dev/null
        done
+       for i in $RDOMAINS; do
+               ifconfig lo$i destroy 2>/dev/null
+       done
 }
 
 CURDIR=$(cd $(dirname $0); pwd)

diff --git a/regress/sys/netinet/carp/carp_4.sh b/regress/sys/netinet/carp/carp_4.sh
index 059d787..98c2d6a 100644 (file)
--- a/regress/sys/netinet/carp/carp_4.sh
+++ b/regress/sys/netinet/carp/carp_4.sh
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#      $OpenBSD: carp_4.sh,v 1.1 2016/10/24 02:52:02 yasuoka Exp $
+#      $OpenBSD: carp_4.sh,v 1.2 2023/10/19 18:36:41 anton Exp $
 
 
 cleanup()
@@ -7,6 +7,9 @@ cleanup()
        for if in $ALL_IFS; do
                ifconfig $if destroy 2>/dev/null
        done
+       for i in $RDOMAINS; do
+               ifconfig lo$i destroy 2>/dev/null
+       done
 }
 
 CURDIR=$(cd $(dirname $0); pwd)

diff --git a/regress/usr.bin/netstat/Makefile b/regress/usr.bin/netstat/Makefile
index ba81d21..09ee1db 100644 (file)
--- a/regress/usr.bin/netstat/Makefile
+++ b/regress/usr.bin/netstat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/03/30 06:37:10 yasuoka Exp $
+# $OpenBSD: Makefile,v 1.3 2023/10/19 18:36:41 anton Exp $
 
 ROUTE?=                /sbin/route
 RDOMAIN?=      5
@@ -13,9 +13,11 @@ NETSTAT?=    /usr/bin/netstat
 
 .BEGIN:
        ${SUDO} ifconfig vether99 destroy 2>/dev/null || true
+       ${SUDO} ifconfig lo${RDOMAIN} destroy 2>/dev/null || true
 
 .END:
        ${SUDO} ifconfig vether99 destroy 2>/dev/null || true
+       ${SUDO} ifconfig lo${RDOMAIN} destroy 2>/dev/null || true
 
 .endif
 .endif

diff --git a/regress/usr.sbin/arp/Makefile b/regress/usr.sbin/arp/Makefile
index 0350a7b..e3555a9 100644 (file)
--- a/regress/usr.sbin/arp/Makefile
+++ b/regress/usr.sbin/arp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2017/07/07 23:55:21 bluhm Exp $
+# $OpenBSD: Makefile,v 1.4 2023/10/19 18:36:41 anton Exp $
 
 RDOMAIN?=      5
 VETHER_MAC=    fe:e1:ba:d2:a3:18
@@ -19,9 +19,11 @@ OTHER_MAC=   cc:77:55:22:aa:66
 
 .END:
        -${SUDO} ifconfig vether10001 destroy
+       -${SUDO} ifconfig lo${RDOMAIN} destroy
 
 .INTERRUPT:
        -${SUDO} ifconfig vether10001 destroy
+       -${SUDO} ifconfig lo${RDOMAIN} destroy
 
 .endif
 .endif