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

Pull up following revision(s) (requested by ozaki-r in ticket #688): 

tests/net/ndp/t_ndp.sh: revision 1.31
	tests/net/if_tap/t_tap.sh: revision 1.8

Avoid setting IP addresses of the same subnet on different interface

If we do so, there will remain one route that is of a preceding address, but
that behavior is not documented and may be changed in the future.  Tests
shouldn't rely on such a unstable behavior.
This commit is contained in:
martin 2018-04-02 09:51:58 +00:00
parent aefe76284e
commit f2bbdb4bcf
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/net/if_tap/t_tap.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: t_tap.sh,v 1.6.6.1 2018/02/26 00:41:14 snj Exp $
# $NetBSD: t_tap.sh,v 1.6.6.2 2018/04/02 09:51:58 martin Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@ -82,10 +82,6 @@ tap_stand_alone_body()
atf_check -s exit:0 rump.ifconfig shmif0 $IP4_LOCAL
atf_check -s exit:0 rump.ifconfig shmif0 inet6 $IP6_LOCAL
atf_check -s exit:0 rump.ifconfig shmif0 up
atf_check -s exit:0 rump.ifconfig tap0 create
atf_check -s exit:0 rump.ifconfig tap0 $IP4_TAP
atf_check -s exit:0 rump.ifconfig tap0 inet6 $IP6_TAP
atf_check -s exit:0 rump.ifconfig tap0 up
atf_check -s exit:0 rump.ifconfig -w 10
export RUMP_SERVER=${SOCK_REMOTE}
@ -96,14 +92,23 @@ tap_stand_alone_body()
atf_check -s exit:0 rump.ifconfig -w 10
atf_check -s exit:0 -o ignore rump.ping -n -w $TIMEOUT -c 1 $IP4_LOCAL
# Cannot reach to an alone tap
atf_check -s not-exit:0 -o ignore -e ignore \
rump.ping -n -w $TIMEOUT -c 1 $IP4_TAP
atf_check -s exit:0 -o ignore rump.ping6 -n -X $TIMEOUT -c 1 $IP6_LOCAL
export RUMP_SERVER=${SOCK_LOCAL}
atf_check -s exit:0 rump.ifconfig shmif0 $IP4_LOCAL delete
atf_check -s exit:0 rump.ifconfig shmif0 inet6 $IP6_LOCAL delete
atf_check -s exit:0 rump.ifconfig tap0 create
atf_check -s exit:0 rump.ifconfig tap0 $IP4_TAP
atf_check -s exit:0 rump.ifconfig tap0 inet6 $IP6_TAP
atf_check -s exit:0 rump.ifconfig tap0 up
atf_check -s exit:0 rump.ifconfig -w 10
export RUMP_SERVER=${SOCK_REMOTE}
# Cannot reach to an alone tap
atf_check -s not-exit:0 -o ignore -e ignore \
rump.ping6 -n -X $TIMEOUT -c 1 $IP6_TAP
atf_check -s not-exit:0 -o ignore -e ignore \
rump.ping -n -w $TIMEOUT -c 1 $IP4_TAP
rump_server_destroy_ifaces
}

4
tests/net/ndp/t_ndp.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: t_ndp.sh,v 1.19.2.1 2017/07/07 13:57:26 martin Exp $
# $NetBSD: t_ndp.sh,v 1.19.2.2 2018/04/02 09:51:58 martin Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@ -490,7 +490,7 @@ ndp_purge_on_route_change_body()
rump_server_add_iface $SOCKSRC shmif1 bus1
export RUMP_SERVER=$SOCKSRC
atf_check -s exit:0 rump.ifconfig shmif1 inet6 $IP6SRC2
atf_check -s exit:0 rump.ifconfig shmif1 inet6 fc00:1::1
atf_check -s exit:0 rump.ifconfig -w 10
$DEBUG && rump.netstat -nr -f inet6