summaryrefslogtreecommitdiff
path: root/regress/sys/net/etherip
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2018-06-25 22:22:50 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2018-06-25 22:22:50 +0000
commit77c7e402d573b7775dd75d78a7b2ef7384b9e050 (patch)
treeb2236ee8996b03a026d0293cee1344691c01c8fe /regress/sys/net/etherip
parent24492ec98a9f26dc69907f48df6290a15b49b3a1 (diff)
Before running the tests, consistently check whether interfaces or
routing domains are busy.
Diffstat (limited to 'regress/sys/net/etherip')
-rw-r--r--regress/sys/net/etherip/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/regress/sys/net/etherip/Makefile b/regress/sys/net/etherip/Makefile
index 9029e5c3f8a..14e4d511abb 100644
--- a/regress/sys/net/etherip/Makefile
+++ b/regress/sys/net/etherip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2018/02/05 18:30:29 anton Exp $
+# $OpenBSD: Makefile,v 1.6 2018/06/25 22:22:49 bluhm Exp $
# Copyright (c) 2017 Alexander Bluhm <bluhm@openbsd.org>
# Copyright (c) 2015 Vincent Gross <vgross@openbsd.org>
@@ -37,9 +37,9 @@ IFS = bridge vether etherip pair
CLEANFILES = stamp-*
-.PHONY: check-interfaces check-rdomains ifconfig unconfig
+.PHONY: busy-interfaces busy-rdomains ifconfig unconfig
-check-interfaces:
+busy-interfaces:
# check if interfaces are busy
.for n in ${NUMS}
.for i in ${IFS}
@@ -48,14 +48,14 @@ check-interfaces:
.endfor
.endfor
-check-rdomains:
+busy-rdomains:
# check if rdomains are busy
.for n in ${NUMS}
@if /sbin/ifconfig | grep -v '^lo${n}:' | grep ' rdomain ${n} '; then\
echo routing domain ${n} is already used >&2; exit 1; fi
.endfor
-ifconfig: check-interfaces check-rdomains
+ifconfig: unconfig
# create and configure interfaces
.for n in ${NUMS}
.for i in ${IFS}
@@ -84,7 +84,7 @@ unconfig:
stamp-setup:
@echo '\n======== $@ ========'
- ${.MAKE} -C ${.CURDIR} ifconfig
+ ${.MAKE} -C ${.CURDIR} busy-interfaces busy-rdomains ifconfig
date >$@
REGRESS_TARGETS += run-regress-ping-1-2