[src/trunk]: src/tests/net/net Set timeout of ping6 to reduce execution time

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b46a412cc859
branches:  trunk
changeset: 341711:b46a412cc859
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Thu Nov 19 10:45:09 2015 +0000

description:
Set timeout of ping6 to reduce execution time

diffstat:

 tests/net/net/t_ipv6address.sh |  28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diffs (85 lines):

diff -r 3762a768b68c -r b46a412cc859 tests/net/net/t_ipv6address.sh
--- a/tests/net/net/t_ipv6address.sh    Thu Nov 19 10:03:26 2015 +0000
+++ b/tests/net/net/t_ipv6address.sh    Thu Nov 19 10:45:09 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_ipv6address.sh,v 1.1 2015/11/12 05:05:25 ozaki-r Exp $
+#      $NetBSD: t_ipv6address.sh,v 1.2 2015/11/19 10:45:09 ozaki-r Exp $
 #
 # Copyright (c) 2015 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -41,6 +41,7 @@
 BUSDST=bus_dst
 
 DEBUG=false
+TIMEOUT=3
 
 atf_test_case linklocal cleanup
 
@@ -227,10 +228,10 @@
        # link local address to link local address
 
        atf_check -s not-exit:0 -e match:"No route to host" \
-               rump.ping6 -c 1 -n ${fwd_if0_lladdr}
+           rump.ping6 -c 1 -X $TIMEOUT -n ${fwd_if0_lladdr}
 
        atf_check -s exit:0 -o match:"0.0% packet loss" \
-           rump.ping6 -c 1 -n ${fwd_if0_lladdr}%shmif0
+           rump.ping6 -c 1 -X $TIMEOUT -n ${fwd_if0_lladdr}%shmif0
 
        atf_check -s ignore -o empty -e ignore \
            -x "shmif_dumpbus -p - ${BUSSRC} | tcpdump -r - -n -p icmp6"
@@ -240,7 +241,8 @@
        cleanup_bus
 
        atf_check -s not-exit:0 -o ignore -e ignore \
-           rump.ping6 -c 1 -n -S ${src_if1_lladdr}%shmif1 ${fwd_if0_lladdr}%shmif0
+           rump.ping6 -c 1 -X $TIMEOUT -n -S ${src_if1_lladdr}%shmif1 \
+           ${fwd_if0_lladdr}%shmif0
        atf_check -s ignore -o not-match:"${src_if1_lladdr}" -e ignore \
            -x "shmif_dumpbus -p - ${BUS1} | tcpdump -r - -n -p icmp6"
        $DEBUG && shmif_dumpbus -p - ${BUS1} | tcpdump -r - -n -p icmp6
@@ -259,15 +261,15 @@
 
        $DEBUG && rump.ifconfig shmif0
        atf_check -s exit:0 -o match:"0.0% packet loss" \
-           rump.ping6 -c 1 -n -S ${src_if0_lladdr}%shmif0 ${IP6FWD0}
+           rump.ping6 -c 1 -X $TIMEOUT -n -S ${src_if0_lladdr}%shmif0 ${IP6FWD0}
        unset RUMP_SERVER
 
        export RUMP_SERVER=${SOCKFWD}
        # host address to link local address
        atf_check -s exit:0 -o match:"0.0% packet loss" \
-           rump.ping6 -c 1 -n ${src_if0_lladdr}%shmif0
+           rump.ping6 -c 1 -X $TIMEOUT -n ${src_if0_lladdr}%shmif0
        atf_check -s not-exit:0 -o match:"100.0% packet loss" \
-           rump.ping6 -c 1 -n ${src_if1_lladdr}%shmif0
+           rump.ping6 -c 1 -X $TIMEOUT -n ${src_if1_lladdr}%shmif0
 
        atf_check -s exit:0 rump.ifconfig shmif0 inet6 ${IP6FWD0} delete
 
@@ -277,19 +279,19 @@
        setup_route
 
        export RUMP_SERVER=${SOCKSRC}
-       atf_check -s exit:0 -o match:"0.0% packet loss" rump.ping6 -c 1 -n \
-           -S ${IP6SRC} ${IP6DST}
+       atf_check -s exit:0 -o match:"0.0% packet loss" rump.ping6 -c 1 \
+           -X $TIMEOUT -n -S ${IP6SRC} ${IP6DST}
 
        cleanup_bus
        $DEBUG && rump.ifconfig shmif0
-       atf_check -s not-exit:0 -o match:"100.0% packet loss" rump.ping6 -c 1 -n \
-           -S ${src_if0_lladdr}%shmif0 ${IP6DST}
+       atf_check -s not-exit:0 -o match:"100.0% packet loss" rump.ping6 -c 1 \
+           -X $TIMEOUT -n -S ${src_if0_lladdr}%shmif0 ${IP6DST}
        atf_check -s ignore -o not-match:"${src_if0_lladdr}" -e ignore \
            -x "shmif_dumpbus -p - ${BUS2} | tcpdump -r - -n -p icmp6"
 
        cleanup_bus
-       atf_check -s not-exit:0 -o match:"100.0% packet loss" rump.ping6 -c 1 -n \
-           -S ${IP6SRC} ${dst_if0_lladdr}%shmif0
+       atf_check -s not-exit:0 -o match:"100.0% packet loss" rump.ping6 -c 1 \
+           -X $TIMEOUT -n -S ${IP6SRC} ${dst_if0_lladdr}%shmif0
        atf_check -s ignore -o not-empty -e ignore \
            -x "shmif_dumpbus -p - ${BUS2} | tcpdump -r - -n -p icmp6"