Module Name: src
Committed By: martin
Date: Mon Apr 2 09:51:58 UTC 2018
Modified Files:
src/tests/net/if_tap [netbsd-8]: t_tap.sh
src/tests/net/ndp [netbsd-8]: t_ndp.sh
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6.6.1 -r1.6.6.2 src/tests/net/if_tap/t_tap.sh
cvs rdiff -u -r1.19.2.1 -r1.19.2.2 src/tests/net/ndp/t_ndp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/if_tap/t_tap.sh
diff -u src/tests/net/if_tap/t_tap.sh:1.6.6.1 src/tests/net/if_tap/t_tap.sh:1.6.6.2
--- src/tests/net/if_tap/t_tap.sh:1.6.6.1 Mon Feb 26 00:41:14 2018
+++ src/tests/net/if_tap/t_tap.sh Mon Apr 2 09:51:58 2018
@@ -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
}
Index: src/tests/net/ndp/t_ndp.sh
diff -u src/tests/net/ndp/t_ndp.sh:1.19.2.1 src/tests/net/ndp/t_ndp.sh:1.19.2.2
--- src/tests/net/ndp/t_ndp.sh:1.19.2.1 Fri Jul 7 13:57:26 2017
+++ src/tests/net/ndp/t_ndp.sh Mon Apr 2 09:51:58 2018
@@ -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
