The branch main has been updated by kp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=6408d025cf343aee6abeeb83ed8f284ad283e1dc
commit 6408d025cf343aee6abeeb83ed8f284ad283e1dc
Author: Kristof Provost <k...@freebsd.org>
AuthorDate: 2023-05-18 20:06:37 +0000
Commit: Kristof Provost <k...@freebsd.org>
CommitDate: 2023-05-18 20:12:08 +0000
carp test: improve jail names for unicast_ll_v6 test
Rename the jails used in the unicast_ll_v6 test, to ensure the jail
names are unique to this test.
That is one of the requirements for running these tests in parallel.
---
tests/sys/netinet/carp.sh | 39 ++++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh
index 7508a6996fcd..5175435a8770 100755
--- a/tests/sys/netinet/carp.sh
+++ b/tests/sys/netinet/carp.sh
@@ -283,48 +283,49 @@ unicast_ll_v6_body()
{
carp_init
+ j=carp_uni_ll_v6
+
bridge=$(vnet_mkbridge)
epair_one=$(vnet_mkepair)
epair_two=$(vnet_mkepair)
- vnet_mkjail carp_uni_v6_one ${bridge} ${epair_one}a ${epair_two}a
- vnet_mkjail carp_uni_v6_two ${epair_one}b
- vnet_mkjail carp_uni_v6_three ${epair_two}b
+ vnet_mkjail ${j}_one ${bridge} ${epair_one}a ${epair_two}a
+ vnet_mkjail ${j}_two ${epair_one}b
+ vnet_mkjail ${j}_three ${epair_two}b
- jexec carp_uni_v6_one ifconfig ${bridge} addm ${epair_one}a \
+ jexec ${j}_one ifconfig ${bridge} addm ${epair_one}a \
addm ${epair_two}a
- jexec carp_uni_v6_one ifconfig ${epair_one}a up
- jexec carp_uni_v6_one ifconfig ${epair_two}a up
- jexec carp_uni_v6_one ifconfig ${bridge} inet6 2001:db8::0:4/64 up \
+ jexec ${j}_one ifconfig ${epair_one}a up
+ jexec ${j}_one ifconfig ${epair_two}a up
+ jexec ${j}_one ifconfig ${bridge} inet6 2001:db8::0:4/64 up \
no_dad
- jexec carp_uni_v6_one ifconfig ${bridge} inet6 alias 2001:db8:1::1/64 \
+ jexec ${j}_one ifconfig ${bridge} inet6 alias 2001:db8:1::1/64 \
no_dad up
- jexec carp_uni_v6_two ifconfig ${epair_one}b inet6 2001:db8:1::2/64 \
+ jexec ${j}_two ifconfig ${epair_one}b inet6 2001:db8:1::2/64 \
no_dad up
- jexec carp_uni_v6_three ifconfig ${epair_two}b inet6 2001:db8:1::3/64 \
+ jexec ${j}_three ifconfig ${epair_two}b inet6 2001:db8:1::3/64 \
no_dad up
- ll_one=$(jexec carp_uni_v6_two ifconfig ${epair_one}b | awk "/
.*%${epair_one}b.* / { print \$2 }" | cut -d % -f 1)
- ll_two=$(jexec carp_uni_v6_three ifconfig ${epair_two}b | awk "/
.*%${epair_two}b.* / { print \$2 }" | cut -d % -f 1)
+ ll_one=$(jexec ${j}_two ifconfig ${epair_one}b | awk "/
.*%${epair_one}b.* / { print \$2 }" | cut -d % -f 1)
+ ll_two=$(jexec ${j}_three ifconfig ${epair_two}b | awk "/
.*%${epair_two}b.* / { print \$2 }" | cut -d % -f 1)
- jexec carp_uni_v6_two ifconfig ${epair_one}b inet6 add vhid 1 \
+ jexec ${j}_two ifconfig ${epair_one}b inet6 add vhid 1 \
peer6 ${ll_two} \
2001:db8::0:1/64
- jexec carp_uni_v6_three ifconfig ${epair_two}b inet6 add vhid 1 \
+ jexec ${j}_three ifconfig ${epair_two}b inet6 add vhid 1 \
peer6 ${ll_one} \
2001:db8::0:1/64
# Sanity check
- atf_check -s exit:0 -o ignore jexec carp_uni_v6_two \
+ atf_check -s exit:0 -o ignore jexec ${j}_two \
ping -6 -c 1 2001:db8:1::3
- wait_for_carp carp_uni_v6_two ${epair_one}b \
- carp_uni_v6_three ${epair_two}b
+ wait_for_carp ${j}_two ${epair_one}b \
+ ${j}_three ${epair_two}b
- atf_check -s exit:0 -o ignore jexec carp_uni_v6_one \
+ atf_check -s exit:0 -o ignore jexec ${j}_one \
ping -6 -c 3 2001:db8::0:1
-
}
unicast_ll_v6_cleanup()
