From c194b7cff257eba07150b65e64df0e8eab4816dc Mon Sep 17 00:00:00 2001 From: mpi Date: Mon, 12 Feb 2018 15:36:40 +0000 Subject: [PATCH] Pass '-inet6' to the default loopback before each test. In order to have reproducible tests route entries must not stay. Otherwise the 'Use' counter keeps growing. --- regress/sbin/route/Makefile | 3 ++- regress/sbin/route/rttest14.ok | 5 +---- regress/sbin/route/rttest16.ok | 5 +---- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/regress/sbin/route/Makefile b/regress/sbin/route/Makefile index d99e3b8569c..7467b858289 100644 --- a/regress/sbin/route/Makefile +++ b/regress/sbin/route/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2018/02/08 13:51:08 mpi Exp $ +# $OpenBSD: Makefile,v 1.25 2018/02/12 15:36:40 mpi Exp $ RDOMAIN?= 5 @@ -10,6 +10,7 @@ RDOMAIN?= 5 .SILENT: .BEGIN .END .BEGIN: + -${SUDO} ifconfig lo${RDOMAIN} -inet6 down -${SUDO} ifconfig lo10001 up rdomain ${RDOMAIN} 192.0.2.1/32 -${SUDO} ifconfig lo10002 up rdomain ${RDOMAIN} 192.0.2.2/32 -${SUDO} ifconfig lo10003 up rdomain ${RDOMAIN} 192.0.2.3/32 diff --git a/regress/sbin/route/rttest14.ok b/regress/sbin/route/rttest14.ok index 9b708203abe..8e8b477303e 100644 --- a/regress/sbin/route/rttest14.ok +++ b/regress/sbin/route/rttest14.ok @@ -2,19 +2,16 @@ Routing tables Internet6: Destination Gateway Flags Refs Use Mtu Prio Iface -::1 ::1 UHl 0 37 32768 1 lo5 +::1 ::1 UHl 0 2 32768 1 lo10001 fd88::1 fd88::1 UHl 0 0 32768 1 lo10002 fd88::666 fd99::1 UGHS 0 0 1500 8 lo10003 fd99::1 fd99::1 UHhl 1 2 32768 1 lo10003 -fe80::1%lo5 fe80::1%lo5 UHl 0 0 32768 1 lo5 fe80::1%lo10001 fe80::1%lo10001 UHl 0 0 32768 1 lo10001 fe80::1%lo10002 fe80::1%lo10002 UHl 0 0 32768 1 lo10002 fe80::1%lo10003 fe80::1%lo10003 UHl 0 0 32768 1 lo10003 -ff01::%lo5/32 ::1 Um 0 1 32768 4 lo5 ff01::%lo10001/32 ::1 Um 0 1 32768 4 lo10001 ff01::%lo10002/32 ::1 Um 0 2 32768 4 lo10002 ff01::%lo10003/32 ::1 Um 0 2 32768 4 lo10003 -ff02::%lo5/32 ::1 Um 0 1 32768 4 lo5 ff02::%lo10001/32 ::1 Um 0 1 32768 4 lo10001 ff02::%lo10002/32 ::1 Um 0 2 32768 4 lo10002 ff02::%lo10003/32 ::1 Um 0 2 32768 4 lo10003 diff --git a/regress/sbin/route/rttest16.ok b/regress/sbin/route/rttest16.ok index 855b9082674..1d776f9c532 100644 --- a/regress/sbin/route/rttest16.ok +++ b/regress/sbin/route/rttest16.ok @@ -2,19 +2,16 @@ Routing tables Internet6: Destination Gateway Flags Refs Use Mtu Prio Iface -::1 ::1 UHl 0 31 32768 1 lo5 +::1 ::1 UHl 0 2 32768 1 lo10001 fd88::1 fd88::1 UHl 0 0 32768 1 lo10002 fd88::666 fd99::1 UGHS 0 0 32768 8 lo10002 fd99::1 fd99::1 UHhl 1 2 32768 1 lo10003 -fe80::1%lo5 fe80::1%lo5 UHl 0 0 32768 1 lo5 fe80::1%lo10001 fe80::1%lo10001 UHl 0 0 32768 1 lo10001 fe80::1%lo10002 fe80::1%lo10002 UHl 0 0 32768 1 lo10002 fe80::1%lo10003 fe80::1%lo10003 UHl 0 0 32768 1 lo10003 -ff01::%lo5/32 ::1 Um 0 1 32768 4 lo5 ff01::%lo10001/32 ::1 Um 0 1 32768 4 lo10001 ff01::%lo10002/32 ::1 Um 0 2 32768 4 lo10002 ff01::%lo10003/32 ::1 Um 0 2 32768 4 lo10003 -ff02::%lo5/32 ::1 Um 0 1 32768 4 lo5 ff02::%lo10001/32 ::1 Um 0 1 32768 4 lo10001 ff02::%lo10002/32 ::1 Um 0 2 32768 4 lo10002 ff02::%lo10003/32 ::1 Um 0 2 32768 4 lo10003 -- 2.20.1