From f522377541d70b7b1aba0eb9da55a32bd222b945 Mon Sep 17 00:00:00 2001 From: bluhm Date: Tue, 30 May 2017 11:57:59 +0000 Subject: [PATCH] Remove the .INTERRUPT target, it prevented to terminate the test with Ctrl-C in some situations. --- regress/sbin/route/Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/regress/sbin/route/Makefile b/regress/sbin/route/Makefile index b3e70aff6e1..cf394a8822f 100644 --- a/regress/sbin/route/Makefile +++ b/regress/sbin/route/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2016/09/01 09:57:45 mpi Exp $ +# $OpenBSD: Makefile,v 1.15 2017/05/30 11:57:59 bluhm Exp $ RDOMAIN?= 5 @@ -7,7 +7,7 @@ RDOMAIN?= 5 .ifmake !obj && !clean && !cleandir && !depend && !regress .if (${.TARGET} != all && ! make(all)) || (${.TARGET} == all) -.SILENT: .BEGIN .END .INTERRUPT +.SILENT: .BEGIN .END .BEGIN: -${SUDO} ifconfig lo10001 up rdomain ${RDOMAIN} 192.0.2.1/32 @@ -21,12 +21,6 @@ RDOMAIN?= 5 -${SUDO} ifconfig lo10003 destroy -${SUDO} ifconfig lo10004 destroy -.INTERRUPT: - -${SUDO} ifconfig lo10001 destroy - -${SUDO} ifconfig lo10002 destroy - -${SUDO} ifconfig lo10003 destroy - -${SUDO} ifconfig lo10004 destroy - .endif .endif @@ -184,7 +178,7 @@ rttest${n}: n= 14 RTTEST_TARGETS+:=rttest${n} rttest${n}: - ${SUDO} ifconfig lo10001 inet6 eui64 + ${SUDO} ifconfig lo10001 inet6 eui64 ${SUDO} ifconfig lo10002 inet6 fd88::1/64 ${SUDO} ifconfig lo10003 inet6 fd99::1/64 ${RCMD} add -inet6 fd88::666 fd99::1 @@ -205,7 +199,7 @@ rttest${n}: n= 16 RTTEST_TARGETS+:=rttest${n} rttest${n}: - ${SUDO} ifconfig lo10001 inet6 eui64 + ${SUDO} ifconfig lo10001 inet6 eui64 ${SUDO} ifconfig lo10002 inet6 fd88::1/64 ${SUDO} ifconfig lo10003 inet6 fd99::1/64 ${RCMD} add -inet6 fd88::666 fd99::1 -- 2.20.1