[src/netbsd-8]: src/tests/net Pull up following revision(s) (requested by oza...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/afb774ad96e5
branches:  netbsd-8
changeset: 851554:afb774ad96e5
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Apr 02 09:51:58 2018 +0000

description:
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.

diffstat:

 tests/net/if_tap/t_tap.sh |  23 ++++++++++++++---------
 tests/net/ndp/t_ndp.sh    |   4 ++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diffs (66 lines):

diff -r fee0c3191995 -r afb774ad96e5 tests/net/if_tap/t_tap.sh
--- a/tests/net/if_tap/t_tap.sh Mon Apr 02 09:11:54 2018 +0000
+++ b/tests/net/if_tap/t_tap.sh Mon Apr 02 09:51:58 2018 +0000
@@ -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 @@
        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 @@
        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
 
-       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
 }
diff -r fee0c3191995 -r afb774ad96e5 tests/net/ndp/t_ndp.sh
--- a/tests/net/ndp/t_ndp.sh    Mon Apr 02 09:11:54 2018 +0000
+++ b/tests/net/ndp/t_ndp.sh    Mon Apr 02 09:51:58 2018 +0000
@@ -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 @@
 
        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