diff options
| author |   benno <benno@openbsd.org> | 2018-10-05 08:57:51 +0000 |
|---|---|---|
| committer | benno <benno@openbsd.org> | 2018-10-05 08:57:51 +0000 |
| commit | 455e2c3fe83d1ee033cecc2bab99247a2a76cb0f (patch) | |
| tree | 333fe5dd27836deb9b6dea80487cb911848f13de | |
| parent | Do not join node information multicast group (RFC 4620). (diff) | |
| download | wireguard-openbsd-455e2c3fe83d1ee033cecc2bab99247a2a76cb0f.tar.xz wireguard-openbsd-455e2c3fe83d1ee033cecc2bab99247a2a76cb0f.zip | |
pass current dir, rdomains and interfaces as argument to the test.
thanks bluhm@ for pointing out the problem.
| -rw-r--r-- | regress/usr.sbin/bgpd/integrationtests/Makefile | 7 | ||||
| -rw-r--r-- | regress/usr.sbin/bgpd/integrationtests/network_statement.sh | 19 |
2 files changed, 15 insertions, 11 deletions
diff --git a/regress/usr.sbin/bgpd/integrationtests/Makefile b/regress/usr.sbin/bgpd/integrationtests/Makefile index 552fc573f02..47e1378804b 100644 --- a/regress/usr.sbin/bgpd/integrationtests/Makefile +++ b/regress/usr.sbin/bgpd/integrationtests/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2018/10/01 20:58:59 benno Exp $ +# $OpenBSD: Makefile,v 1.2 2018/10/05 08:57:51 benno Exp $ -REGRESS_TARGETS = network_statement +REGRESS_TARGETS = network_statement +BGPD ?= /usr/sbin/bgpd network_statement: - ${SUDO} ksh ${.CURDIR}/$@.sh + ${SUDO} ksh -x ${.CURDIR}/$@.sh ${BGPD} ${.CURDIR} 11 12 pair11 pair12 .include <bsd.regress.mk> diff --git a/regress/usr.sbin/bgpd/integrationtests/network_statement.sh b/regress/usr.sbin/bgpd/integrationtests/network_statement.sh index 3fd23166b08..83a1beea5e3 100644 --- a/regress/usr.sbin/bgpd/integrationtests/network_statement.sh +++ b/regress/usr.sbin/bgpd/integrationtests/network_statement.sh @@ -1,15 +1,16 @@ #!/bin/ksh -# $OpenBSD: network_statement.sh,v 1.1 2018/10/01 20:58:59 benno Exp $ +# $OpenBSD: network_statement.sh,v 1.2 2018/10/05 08:57:51 benno Exp $ set -e -BGPD=/usr/sbin/bgpd +BGPD=$1 +BGPDCONFIGDIR=$2 +RDOMAIN1=$3 +RDOMAIN2=$4 +PAIR1=$5 +PAIR2=$6 -RDOMAIN1=11 -RDOMAIN2=12 RDOMAINS="${RDOMAIN1} ${RDOMAIN2}" -PAIR1="pair11" -PAIR2="pair12" PAIRS="${PAIR1} ${PAIR2}" PAIR1IP=10.12.57.1 PAIR2IP=10.12.57.2 @@ -69,8 +70,10 @@ route -T ${RDOMAIN2} add -label PAIR2RTABLE ${PAIR2RTABLE} \ ${PAIR1IP} route -T ${RDOMAIN2} add -priority 55 ${PAIR2PRIORITY} \ ${PAIR1IP} -route -T ${RDOMAIN1} exec ${BGPD} -f bgpd.network_statement.rdomain1.conf -route -T ${RDOMAIN2} exec ${BGPD} -f bgpd.network_statement.rdomain2.conf +route -T ${RDOMAIN1} exec ${BGPD} \ + -f ${BGPDCONFIGDIR}/bgpd.network_statement.rdomain1.conf +route -T ${RDOMAIN2} exec ${BGPD} \ + -f ${BGPDCONFIGDIR}/bgpd.network_statement.rdomain2.conf sleep 2 |