Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: add missing ifconfig -w 

This change mitigates PR kern/54897.
This commit is contained in:
ozaki-r 2020-02-17 08:46:10 +00:00
parent fbd9ae86b4
commit ccef126b54
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/net/ipsec/t_ipsec_gif.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: t_ipsec_gif.sh,v 1.8 2019/08/19 03:22:05 ozaki-r Exp $
# $NetBSD: t_ipsec_gif.sh,v 1.9 2020/02/17 08:46:10 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@ -59,6 +59,15 @@ make_gif_pktstr()
echo "$src > $dst: $proto_cap.+$inner_str"
}
wait_for_all_dad_completions()
{
for sock in $SOCK_LOCAL $SOCK_TUN_LOCAL $SOCK_TUN_REMOTE $SOCK_REMOTE; do
export RUMP_SERVER=$sock
atf_check -s exit:0 rump.ifconfig -w 10
done
}
test_ipsec4_gif()
{
local mode=$1
@ -121,8 +130,9 @@ test_ipsec4_gif()
export RUMP_SERVER=$SOCK_REMOTE
atf_check -s exit:0 rump.ifconfig shmif0 $ip_remote/24
# Run ifconfig -w 10 just once for optimization
atf_check -s exit:0 rump.ifconfig -w 10
wait_for_all_dad_completions
atf_check -s exit:0 -o ignore \
rump.route -n add -net $subnet_local $ip_gw_remote
@ -273,8 +283,9 @@ test_ipsec6_gif()
export RUMP_SERVER=$SOCK_REMOTE
atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_remote
# Run ifconfig -w 10 just once for optimization
atf_check -s exit:0 rump.ifconfig -w 10
wait_for_all_dad_completions
atf_check -s exit:0 -o ignore \
rump.route -n add -inet6 -net $subnet_local/64 $ip_gw_remote

19
tests/net/ipsec/t_ipsec_l2tp.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: t_ipsec_l2tp.sh,v 1.8 2019/08/19 03:22:05 ozaki-r Exp $
# $NetBSD: t_ipsec_l2tp.sh,v 1.9 2020/02/17 08:46:10 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@ -62,6 +62,15 @@ make_l2tp_pktstr()
echo "$src > $dst: $proto_cap.+$proto_str"
}
wait_for_all_dad_completions()
{
for sock in $SOCK_LOCAL $SOCK_TUN_LOCAL $SOCK_TUN_REMOTE $SOCK_REMOTE; do
export RUMP_SERVER=$sock
atf_check -s exit:0 rump.ifconfig -w 10
done
}
test_ipsec4_l2tp()
{
local mode=$1
@ -121,8 +130,8 @@ test_ipsec4_l2tp()
export RUMP_SERVER=$SOCK_REMOTE
atf_check -s exit:0 rump.ifconfig shmif0 $ip_remote/24
# Run ifconfig -w 10 just once for optimization
atf_check -s exit:0 rump.ifconfig -w 10
wait_for_all_dad_completions
extract_new_packets $BUS_TUNNEL > $outfile
@ -263,8 +272,8 @@ test_ipsec6_l2tp()
export RUMP_SERVER=$SOCK_REMOTE
atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_remote
# Run ifconfig -w 10 just once for optimization
atf_check -s exit:0 rump.ifconfig -w 10
wait_for_all_dad_completions
extract_new_packets $BUS_TUNNEL > $outfile