Module Name: src
Committed By: ozaki-r
Date: Tue Jun 21 05:04:16 UTC 2016
Modified Files:
src/tests/net/arp: t_arp.sh
src/tests/net/if: t_ifconfig.sh
src/tests/net/if_bridge: t_bridge.sh
src/tests/net/if_tap: t_tap.sh
src/tests/net/ndp: t_ndp.sh
src/tests/net/net: t_forwarding.sh
src/tests/net/route: t_flags.sh t_route.sh
Log Message:
Make a bunch of test names self-descriptive
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/tests/net/arp/t_arp.sh
cvs rdiff -u -r1.9 -r1.10 src/tests/net/if/t_ifconfig.sh
cvs rdiff -u -r1.11 -r1.12 src/tests/net/if_bridge/t_bridge.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/net/if_tap/t_tap.sh
cvs rdiff -u -r1.11 -r1.12 src/tests/net/ndp/t_ndp.sh
cvs rdiff -u -r1.12 -r1.13 src/tests/net/net/t_forwarding.sh
cvs rdiff -u -r1.8 -r1.9 src/tests/net/route/t_flags.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/route/t_route.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/arp/t_arp.sh
diff -u src/tests/net/arp/t_arp.sh:1.15 src/tests/net/arp/t_arp.sh:1.16
--- src/tests/net/arp/t_arp.sh:1.15 Mon Apr 18 02:27:34 2016
+++ src/tests/net/arp/t_arp.sh Tue Jun 21 05:04:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_arp.sh,v 1.15 2016/04/18 02:27:34 ozaki-r Exp $
+# $NetBSD: t_arp.sh,v 1.16 2016/06/21 05:04:16 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,65 +39,65 @@ IP4DST_PROXYARP2=10.0.1.4
DEBUG=false
TIMEOUT=1
-atf_test_case cache_expiration_5s cleanup
-atf_test_case cache_expiration_10s cleanup
-atf_test_case command cleanup
-atf_test_case garp cleanup
-atf_test_case cache_overwriting cleanup
-atf_test_case proxy_arp_pub cleanup
-atf_test_case proxy_arp_pubproxy cleanup
-atf_test_case link_activation cleanup
-atf_test_case static_arp cleanup
+atf_test_case arp_cache_expiration_5s cleanup
+atf_test_case arp_cache_expiration_10s cleanup
+atf_test_case arp_command cleanup
+atf_test_case arp_garp cleanup
+atf_test_case arp_cache_overwriting cleanup
+atf_test_case arp_proxy_arp_pub cleanup
+atf_test_case arp_proxy_arp_pubproxy cleanup
+atf_test_case arp_link_activation cleanup
+atf_test_case arp_static cleanup
-cache_expiration_5s_head()
+arp_cache_expiration_5s_head()
{
atf_set "descr" "Tests for ARP cache expiration (5s)"
atf_set "require.progs" "rump_server"
}
-cache_expiration_10s_head()
+arp_cache_expiration_10s_head()
{
atf_set "descr" "Tests for ARP cache expiration (10s)"
atf_set "require.progs" "rump_server"
}
-command_head()
+arp_command_head()
{
- atf_set "descr" "Tests for commands of arp(8)"
+ atf_set "descr" "Tests for arp_commands of arp(8)"
atf_set "require.progs" "rump_server"
}
-garp_head()
+arp_garp_head()
{
atf_set "descr" "Tests for GARP"
atf_set "require.progs" "rump_server"
}
-cache_overwriting_head()
+arp_cache_overwriting_head()
{
atf_set "descr" "Tests for behavior of overwriting ARP caches"
atf_set "require.progs" "rump_server"
}
-proxy_arp_pub_head()
+arp_proxy_arp_pub_head()
{
atf_set "descr" "Tests for Proxy ARP (pub)"
atf_set "require.progs" "rump_server"
}
-proxy_arp_pubproxy_head()
+arp_proxy_arp_pubproxy_head()
{
atf_set "descr" "Tests for Proxy ARP (pub proxy)"
atf_set "require.progs" "rump_server"
}
-link_activation_head()
+arp_link_activation_head()
{
atf_set "descr" "Tests for activating a new MAC address"
atf_set "require.progs" "rump_server"
}
-static_arp_head()
+arp_static_head()
{
atf_set "descr" "Tests for static ARP entries"
@@ -170,17 +170,17 @@ test_cache_expiration()
atf_check -s not-exit:0 -e ignore rump.arp -n $IP4DST
}
-cache_expiration_5s_body()
+arp_cache_expiration_5s_body()
{
test_cache_expiration 5
}
-cache_expiration_10s_body()
+arp_cache_expiration_10s_body()
{
test_cache_expiration 10
}
-command_body()
+arp_command_body()
{
local arp_keep=5
local bonus=2
@@ -269,7 +269,7 @@ make_pkt_str_arpreq()
echo $pkt
}
-garp_body()
+arp_garp_body()
{
local pkt=
@@ -306,7 +306,7 @@ garp_body()
atf_check -s not-exit:0 -x "cat ./out |grep -q '$pkt'"
}
-cache_overwriting_body()
+arp_cache_overwriting_body()
{
local arp_keep=5
local bonus=2
@@ -478,19 +478,19 @@ test_proxy_arp()
atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 $IP4DST_PROXYARP2
}
-proxy_arp_pub_body()
+arp_proxy_arp_pub_body()
{
test_proxy_arp pub
}
-proxy_arp_pubproxy_body()
+arp_proxy_arp_pubproxy_body()
{
test_proxy_arp pubproxy
}
-link_activation_body()
+arp_link_activation_body()
{
local arp_keep=5
local bonus=2
@@ -528,7 +528,7 @@ link_activation_body()
"cat ./out |grep '$pkt' |grep -q 'b2:a1:00:00:00:02'"
}
-static_arp_body()
+arp_static_body()
{
local arp_keep=5
local macaddr_src=
@@ -584,56 +584,56 @@ dump()
shmif_dumpbus -p - bus1 2>/dev/null| tcpdump -n -e -r -
}
-cache_expiration_5s_cleanup()
+arp_cache_expiration_5s_cleanup()
{
$DEBUG && dump
cleanup
}
-cache_expiration_10s_cleanup()
+arp_cache_expiration_10s_cleanup()
{
$DEBUG && dump
cleanup
}
-command_cleanup()
+arp_command_cleanup()
{
$DEBUG && dump
cleanup
}
-garp_cleanup()
+arp_garp_cleanup()
{
$DEBUG && dump_src
$DEBUG && shmif_dumpbus -p - bus1 2>/dev/null| tcpdump -n -e -r -
env RUMP_SERVER=$SOCKSRC rump.halt
}
-cache_overwriting_cleanup()
+arp_cache_overwriting_cleanup()
{
$DEBUG && dump
cleanup
}
-proxy_arp_pub_cleanup()
+arp_proxy_arp_pub_cleanup()
{
$DEBUG && dump
cleanup
}
-proxy_arp_pubproxy_cleanup()
+arp_proxy_arp_pubproxy_cleanup()
{
$DEBUG && dump
cleanup
}
-link_activation_cleanup()
+arp_link_activation_cleanup()
{
$DEBUG && dump
cleanup
}
-static_arp_cleanup()
+arp_static_cleanup()
{
$DEBUG && dump
cleanup
@@ -641,13 +641,13 @@ static_arp_cleanup()
atf_init_test_cases()
{
- atf_add_test_case cache_expiration_5s
- atf_add_test_case cache_expiration_10s
- atf_add_test_case command
- atf_add_test_case garp
- atf_add_test_case cache_overwriting
- atf_add_test_case proxy_arp_pub
- atf_add_test_case proxy_arp_pubproxy
- atf_add_test_case link_activation
- atf_add_test_case static_arp
+ atf_add_test_case arp_cache_expiration_5s
+ atf_add_test_case arp_cache_expiration_10s
+ atf_add_test_case arp_command
+ atf_add_test_case arp_garp
+ atf_add_test_case arp_cache_overwriting
+ atf_add_test_case arp_proxy_arp_pub
+ atf_add_test_case arp_proxy_arp_pubproxy
+ atf_add_test_case arp_link_activation
+ atf_add_test_case arp_static
}
Index: src/tests/net/if/t_ifconfig.sh
diff -u src/tests/net/if/t_ifconfig.sh:1.9 src/tests/net/if/t_ifconfig.sh:1.10
--- src/tests/net/if/t_ifconfig.sh:1.9 Thu Apr 28 01:20:31 2016
+++ src/tests/net/if/t_ifconfig.sh Tue Jun 21 05:04:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ifconfig.sh,v 1.9 2016/04/28 01:20:31 ozaki-r Exp $
+# $NetBSD: t_ifconfig.sh,v 1.10 2016/06/21 05:04:16 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,15 +33,15 @@ RUMP_FLAGS=\
TIMEOUT=3
-atf_test_case create_destroy cleanup
-create_destroy_head()
+atf_test_case ifconfig_create_destroy cleanup
+ifconfig_create_destroy_head()
{
atf_set "descr" "tests of ifconfig create and destroy"
atf_set "require.progs" "rump_server"
}
-create_destroy_body()
+ifconfig_create_destroy_body()
{
atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER1}
@@ -68,21 +68,21 @@ create_destroy_body()
unset RUMP_SERVER
}
-create_destroy_cleanup()
+ifconfig_create_destroy_cleanup()
{
RUMP_SERVER=${RUMP_SERVER1} rump.halt
}
-atf_test_case options cleanup
-options_head()
+atf_test_case ifconfig_options cleanup
+ifconfig_options_head()
{
atf_set "descr" "tests of ifconfig options"
atf_set "require.progs" "rump_server"
}
-options_body()
+ifconfig_options_body()
{
export RUMP_SERVER=${RUMP_SERVER1}
@@ -182,21 +182,21 @@ options_body()
unset RUMP_SERVER
}
-options_cleanup()
+ifconfig_options_cleanup()
{
env RUMP_SERVER=${RUMP_SERVER1} rump.halt
}
-atf_test_case parameters cleanup
-parameters_head()
+atf_test_case ifconfig_parameters cleanup
+ifconfig_parameters_head()
{
- atf_set "descr" "tests of interface parametors"
+ atf_set "descr" "tests of interface parameters"
atf_set "require.progs" "rump_server"
}
-parameters_body()
+ifconfig_parameters_body()
{
local interval=
@@ -313,7 +313,7 @@ parameters_body()
unset RUMP_SERVER
}
-parameters_cleanup()
+ifconfig_parameters_cleanup()
{
env RUMP_SERVER=${RUMP_SERVER1} rump.halt
env RUMP_SERVER=${RUMP_SERVER2} rump.halt
@@ -322,7 +322,7 @@ parameters_cleanup()
atf_init_test_cases()
{
- atf_add_test_case create_destroy
- atf_add_test_case options
- atf_add_test_case parameters
+ atf_add_test_case ifconfig_create_destroy
+ atf_add_test_case ifconfig_options
+ atf_add_test_case ifconfig_parameters
}
Index: src/tests/net/if_bridge/t_bridge.sh
diff -u src/tests/net/if_bridge/t_bridge.sh:1.11 src/tests/net/if_bridge/t_bridge.sh:1.12
--- src/tests/net/if_bridge/t_bridge.sh:1.11 Fri Aug 7 00:50:12 2015
+++ src/tests/net/if_bridge/t_bridge.sh Tue Jun 21 05:04:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_bridge.sh,v 1.11 2015/08/07 00:50:12 ozaki-r Exp $
+# $NetBSD: t_bridge.sh,v 1.12 2016/06/21 05:04:16 ozaki-r Exp $
#
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -42,37 +42,37 @@ IP6BR2=fc00::12
TIMEOUT=5
-atf_test_case basic cleanup
-atf_test_case basic6 cleanup
-atf_test_case rtable cleanup
-atf_test_case member_ip cleanup
-atf_test_case member_ip6 cleanup
+atf_test_case bridge_ipv4 cleanup
+atf_test_case bridge_ipv6 cleanup
+atf_test_case bridge_rtable cleanup
+atf_test_case bridge_member_ipv4 cleanup
+atf_test_case bridge_member_ipv6 cleanup
-basic_head()
+bridge_ipv4_head()
{
atf_set "descr" "Does simple if_bridge tests"
atf_set "require.progs" "rump_server"
}
-basic6_head()
+bridge_ipv6_head()
{
atf_set "descr" "Does simple if_bridge tests (IPv6)"
atf_set "require.progs" "rump_server"
}
-rtable_head()
+bridge_rtable_head()
{
atf_set "descr" "Tests route table operations of if_bridge"
atf_set "require.progs" "rump_server"
}
-member_ip_head()
+bridge_member_ipv4_head()
{
atf_set "descr" "Tests if_bridge with members with an IP address"
atf_set "require.progs" "rump_server"
}
-member_ip6_head()
+bridge_member_ipv6_head()
{
atf_set "descr" "Tests if_bridge with members with an IP address (IPv6)"
atf_set "require.progs" "rump_server"
@@ -403,7 +403,7 @@ test_brconfig_maxaddr()
unset LD_PRELOAD
}
-basic_body()
+bridge_ipv4_body()
{
setup
test_setup
@@ -420,7 +420,7 @@ basic_body()
test_ping_failure
}
-basic6_body()
+bridge_ipv6_body()
{
setup6
test_setup6
@@ -436,7 +436,7 @@ basic6_body()
test_ping6_failure
}
-rtable_body()
+bridge_rtable_body()
{
addr1= addr3=
@@ -509,7 +509,7 @@ rtable_body()
# wait here so long. Should we have a sysctl to change the period?
}
-member_ip_body()
+bridge_member_ipv4_body()
{
setup
test_setup
@@ -529,7 +529,7 @@ member_ip_body()
test_ping_failure
}
-member_ip6_body()
+bridge_member_ipv6_body()
{
setup6
test_setup6
@@ -548,31 +548,31 @@ member_ip6_body()
test_ping6_failure
}
-basic_cleanup()
+bridge_ipv4_cleanup()
{
dump_bus
cleanup
}
-basic6_cleanup()
+bridge_ipv6_cleanup()
{
dump_bus
cleanup
}
-rtable_cleanup()
+bridge_rtable_cleanup()
{
dump_bus
cleanup
}
-member_ip_cleanup()
+bridge_member_ipv4_cleanup()
{
dump_bus
cleanup
}
-member_ip6_cleanup()
+bridge_member_ipv6_cleanup()
{
dump_bus
cleanup
@@ -580,9 +580,9 @@ member_ip6_cleanup()
atf_init_test_cases()
{
- atf_add_test_case basic
- atf_add_test_case basic6
- atf_add_test_case rtable
- atf_add_test_case member_ip
- atf_add_test_case member_ip6
+ atf_add_test_case bridge_ipv4
+ atf_add_test_case bridge_ipv6
+ atf_add_test_case bridge_rtable
+ atf_add_test_case bridge_member_ipv4
+ atf_add_test_case bridge_member_ipv6
}
Index: src/tests/net/if_tap/t_tap.sh
diff -u src/tests/net/if_tap/t_tap.sh:1.1 src/tests/net/if_tap/t_tap.sh:1.2
--- src/tests/net/if_tap/t_tap.sh:1.1 Fri Mar 4 02:44:45 2016
+++ src/tests/net/if_tap/t_tap.sh Tue Jun 21 05:04:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_tap.sh,v 1.1 2016/03/04 02:44:45 ozaki-r Exp $
+# $NetBSD: t_tap.sh,v 1.2 2016/06/21 05:04:16 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -42,15 +42,15 @@ IP6_REMOTE=fc00::3
DEBUG=false
TIMEOUT=1
-atf_test_case create_destroy cleanup
-create_destroy_head()
+atf_test_case tap_create_destroy cleanup
+tap_create_destroy_head()
{
atf_set "descr" "tests of creation and deletion of tap interface"
atf_set "require.progs" "rump_server"
}
-create_destroy_body()
+tap_create_destroy_body()
{
atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${SOCK_LOCAL}
@@ -74,21 +74,21 @@ create_destroy_body()
atf_check -s exit:0 rump.ifconfig tap0 destroy
}
-create_destroy_cleanup()
+tap_create_destroy_cleanup()
{
RUMP_SERVER=${SOCK_LOCAL} rump.halt
}
-atf_test_case stand_alone cleanup
-create_destroy_head()
+atf_test_case tap_stand_alone cleanup
+tap_create_destroy_head()
{
atf_set "descr" "tests of alone tap interface"
atf_set "require.progs" "rump_server"
}
-stand_alone_body()
+tap_stand_alone_body()
{
atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${SOCK_LOCAL}
atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${SOCK_REMOTE}
@@ -126,22 +126,22 @@ stand_alone_body()
rump.ping6 -n -X $TIMEOUT -c 1 $IP6_TAP
}
-stand_alone_cleanup()
+tap_stand_alone_cleanup()
{
RUMP_SERVER=${SOCK_LOCAL} rump.halt
RUMP_SERVER=${SOCK_REMOTE} rump.halt
}
-atf_test_case bridged cleanup
-bridged_head()
+atf_test_case tap_bridged cleanup
+tap_bridged_head()
{
atf_set "descr" "tests of alone tap interface"
atf_set "require.progs" "rump_server"
}
-bridged_body()
+tap_bridged_body()
{
atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${SOCK_LOCAL}
atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${SOCK_REMOTE}
@@ -182,7 +182,7 @@ bridged_body()
atf_check -s exit:0 -o ignore rump.ping6 -n -X $TIMEOUT -c 1 $IP6_TAP
}
-bridged_cleanup()
+tap_bridged_cleanup()
{
RUMP_SERVER=${SOCK_LOCAL} rump.halt
@@ -192,7 +192,7 @@ bridged_cleanup()
atf_init_test_cases()
{
- atf_add_test_case create_destroy
- atf_add_test_case stand_alone
- atf_add_test_case bridged
+ atf_add_test_case tap_create_destroy
+ atf_add_test_case tap_stand_alone
+ atf_add_test_case tap_bridged
}
Index: src/tests/net/ndp/t_ndp.sh
diff -u src/tests/net/ndp/t_ndp.sh:1.11 src/tests/net/ndp/t_ndp.sh:1.12
--- src/tests/net/ndp/t_ndp.sh:1.11 Fri May 20 06:48:52 2016
+++ src/tests/net/ndp/t_ndp.sh Tue Jun 21 05:04:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ndp.sh,v 1.11 2016/05/20 06:48:52 ozaki-r Exp $
+# $NetBSD: t_ndp.sh,v 1.12 2016/06/21 05:04:16 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -37,37 +37,37 @@ IP6DST=fc00::2
DEBUG=true
TIMEOUT=1
-atf_test_case cache_expiration cleanup
-atf_test_case command cleanup
-atf_test_case cache_overwriting cleanup
-atf_test_case neighborgcthresh cleanup
-atf_test_case link_activation cleanup
+atf_test_case ndp_cache_expiration cleanup
+atf_test_case ndp_commands cleanup
+atf_test_case ndp_cache_overwriting cleanup
+atf_test_case ndp_neighborgcthresh cleanup
+atf_test_case ndp_link_activation cleanup
-cache_expiration_head()
+ndp_cache_expiration_head()
{
atf_set "descr" "Tests for NDP cache expiration"
atf_set "require.progs" "rump_server"
}
-command_head()
+ndp_commands_head()
{
atf_set "descr" "Tests for commands of ndp(8)"
atf_set "require.progs" "rump_server"
}
-cache_overwriting_head()
+ndp_cache_overwriting_head()
{
atf_set "descr" "Tests for behavior of overwriting NDP caches"
atf_set "require.progs" "rump_server"
}
-neighborgcthresh_head()
+ndp_neighborgcthresh_head()
{
atf_set "descr" "Tests for GC of neighbor caches"
atf_set "require.progs" "rump_server"
}
-link_activation_head()
+ndp_link_activation_head()
{
atf_set "descr" "Tests for activating a new MAC address"
atf_set "require.progs" "rump_server"
@@ -116,7 +116,7 @@ get_timeout()
echo $timeout
}
-cache_expiration_body()
+ndp_cache_expiration_body()
{
atf_check -s exit:0 ${inetserver} $SOCKSRC
atf_check -s exit:0 ${inetserver} $SOCKDST
@@ -152,7 +152,7 @@ ifdown_dst_server()
export RUMP_SERVER=$SOCKSRC
}
-command_body()
+ndp_commands_body()
{
atf_check -s exit:0 ${inetserver} $SOCKSRC
atf_check -s exit:0 ${inetserver} $SOCKDST
@@ -219,7 +219,7 @@ command_body()
return 0
}
-cache_overwriting_body()
+ndp_cache_overwriting_body()
{
atf_check -s exit:0 ${inetserver} $SOCKSRC
atf_check -s exit:0 ${inetserver} $SOCKDST
@@ -257,7 +257,7 @@ get_n_caches()
echo $(rump.ndp -a -n |grep -v -e Neighbor -e permanent |wc -l)
}
-neighborgcthresh_body()
+ndp_neighborgcthresh_body()
{
atf_check -s exit:0 ${inetserver} $SOCKSRC
@@ -338,7 +338,7 @@ extract_new_packets()
cat ./diff
}
-link_activation_body()
+ndp_link_activation_body()
{
local linklocal=
@@ -413,31 +413,31 @@ dump()
$DEBUG && gdb -ex bt /usr/sbin/rump.ndp rump.ndp.core
}
-cache_expiration_cleanup()
+ndp_cache_expiration_cleanup()
{
$DEBUG && dump
cleanup
}
-command_cleanup()
+ndp_commands_cleanup()
{
$DEBUG && dump
cleanup
}
-cache_overwriting_cleanup()
+ndp_cache_overwriting_cleanup()
{
$DEBUG && dump
cleanup
}
-neighborgcthresh_cleanup()
+ndp_neighborgcthresh_cleanup()
{
$DEBUG && dump
cleanup
}
-link_activation_cleanup()
+ndp_link_activation_cleanup()
{
$DEBUG && dump
cleanup
@@ -445,9 +445,9 @@ link_activation_cleanup()
atf_init_test_cases()
{
- atf_add_test_case cache_expiration
- atf_add_test_case command
- atf_add_test_case cache_overwriting
- atf_add_test_case neighborgcthresh
- atf_add_test_case link_activation
+ atf_add_test_case ndp_cache_expiration
+ atf_add_test_case ndp_commands
+ atf_add_test_case ndp_cache_overwriting
+ atf_add_test_case ndp_neighborgcthresh
+ atf_add_test_case ndp_link_activation
}
Index: src/tests/net/net/t_forwarding.sh
diff -u src/tests/net/net/t_forwarding.sh:1.12 src/tests/net/net/t_forwarding.sh:1.13
--- src/tests/net/net/t_forwarding.sh:1.12 Mon Apr 4 07:37:08 2016
+++ src/tests/net/net/t_forwarding.sh Tue Jun 21 05:04:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_forwarding.sh,v 1.12 2016/04/04 07:37:08 ozaki-r Exp $
+# $NetBSD: t_forwarding.sh,v 1.13 2016/06/21 05:04:16 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -46,25 +46,25 @@ HTML_FILE=index.html
DEBUG=false
TIMEOUT=5
-atf_test_case basic cleanup
-atf_test_case basic6 cleanup
-atf_test_case fastforward cleanup
-atf_test_case fastforward6 cleanup
-atf_test_case misc cleanup
+atf_test_case ipforwarding_v4 cleanup
+atf_test_case ipforwarding_v6 cleanup
+atf_test_case ipforwarding_fastforward_v4 cleanup
+atf_test_case ipforwarding_fastforward_v6 cleanup
+atf_test_case ipforwarding_misc cleanup
-basic_head()
+ipforwarding_v4_head()
{
atf_set "descr" "Does IPv4 forwarding tests"
atf_set "require.progs" "rump_server"
}
-basic6_head()
+ipforwarding_v6_head()
{
atf_set "descr" "Does IPv6 forwarding tests"
atf_set "require.progs" "rump_server"
}
-misc_head()
+ipforwarding_misc_head()
{
atf_set "descr" "Does IPv4 forwarding tests"
atf_set "require.progs" "rump_server"
@@ -427,7 +427,7 @@ test_hoplimit()
$DEBUG && rump.ifconfig -v shmif0
}
-basic_body()
+ipforwarding_v4_body()
{
setup
test_setup
@@ -441,7 +441,7 @@ basic_body()
test_ping_failure
}
-basic6_body()
+ipforwarding_v6_body()
{
setup6
test_setup6
@@ -456,7 +456,7 @@ basic6_body()
test_ping6_failure
}
-fastforward_body()
+ipforwarding_fastforward_v4_body()
{
setup
test_setup
@@ -468,7 +468,7 @@ fastforward_body()
test_http_get $IP4DST
}
-fastforward6_body()
+ipforwarding_fastforward_v6_body()
{
setup6
test_setup6
@@ -480,7 +480,7 @@ fastforward6_body()
test_http_get "[$IP6DST]"
}
-misc_body()
+ipforwarding_misc_body()
{
setup
test_setup
@@ -498,33 +498,33 @@ misc_body()
return 0
}
-basic_cleanup()
+ipforwarding_v4_cleanup()
{
dump
cleanup
}
-basic6_cleanup()
+ipforwarding_v6_cleanup()
{
dump
cleanup
}
-fastforward_cleanup()
+ipforwarding_fastforward_v4_cleanup()
{
dump
cleanup_bozo
cleanup
}
-fastforward6_cleanup()
+ipforwarding_fastforward_v6_cleanup()
{
dump
cleanup_bozo
cleanup
}
-misc_cleanup()
+ipforwarding_misc_cleanup()
{
dump
cleanup_bozo
@@ -533,9 +533,9 @@ misc_cleanup()
atf_init_test_cases()
{
- atf_add_test_case basic
- atf_add_test_case basic6
- atf_add_test_case fastforward
- atf_add_test_case fastforward6
- atf_add_test_case misc
+ atf_add_test_case ipforwarding_v4
+ atf_add_test_case ipforwarding_v6
+ atf_add_test_case ipforwarding_fastforward_v4
+ atf_add_test_case ipforwarding_fastforward_v6
+ atf_add_test_case ipforwarding_misc
}
Index: src/tests/net/route/t_flags.sh
diff -u src/tests/net/route/t_flags.sh:1.8 src/tests/net/route/t_flags.sh:1.9
--- src/tests/net/route/t_flags.sh:1.8 Sat Apr 23 15:47:54 2016
+++ src/tests/net/route/t_flags.sh Tue Jun 21 05:04:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_flags.sh,v 1.8 2016/04/23 15:47:54 ozaki-r Exp $
+# $NetBSD: t_flags.sh,v 1.9 2016/06/21 05:04:16 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -123,7 +123,7 @@ check_entry_fail()
"rump.netstat -rn -f inet | grep ^'$ip'"
}
-test_lo()
+test_lo6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -132,7 +132,7 @@ test_lo()
check_entry_flags 127.0.0.1 UHl
}
-test_connected()
+test_connected6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -144,7 +144,7 @@ test_connected()
check_entry_flags 10.0.0/24 UC
}
-test_default_gateway()
+test_default_gateway6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -156,7 +156,7 @@ test_default_gateway()
check_entry_flags default UGS
}
-test_static()
+test_static6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -176,7 +176,7 @@ test_static()
check_entry_flags 10.0.2/24 UGS
}
-test_blackhole()
+test_blackhole6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -202,7 +202,7 @@ test_blackhole()
check_entry_fail 10.0.0.1 UH
}
-test_reject()
+test_reject6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -261,7 +261,7 @@ test_reject()
return 0
}
-test_icmp_redirect()
+test_icmp_redirect6()
{
### Testing Dynamic flag ###
@@ -320,7 +320,7 @@ test_icmp_redirect()
teardown_gw
}
-test_announce()
+test_announce6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -368,12 +368,12 @@ add_test()
atf_init_test_cases()
{
- add_test lo "Tests route flags: loop back interface"
- add_test connected "Tests route flags: connected route"
- add_test default_gateway "Tests route flags: default gateway"
- add_test static "Tests route flags: static route"
- add_test blackhole "Tests route flags: blackhole route"
- add_test reject "Tests route flags: reject route"
- add_test icmp_redirect "Tests route flags: icmp redirect"
- add_test announce "Tests route flags: announce flag"
+ add_test lo6 "Tests route flags: loop back interface"
+ add_test connected6 "Tests route flags: connected route"
+ add_test default_gateway6 "Tests route flags: default gateway"
+ add_test static6 "Tests route flags: static route"
+ add_test blackhole6 "Tests route flags: blackhole route"
+ add_test reject6 "Tests route flags: reject route"
+ add_test icmp_redirect6 "Tests route flags: icmp redirect"
+ add_test announce6 "Tests route flags: announce flag"
}
Index: src/tests/net/route/t_route.sh
diff -u src/tests/net/route/t_route.sh:1.4 src/tests/net/route/t_route.sh:1.5
--- src/tests/net/route/t_route.sh:1.4 Mon Apr 4 07:37:08 2016
+++ src/tests/net/route/t_route.sh Tue Jun 21 05:04:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_route.sh,v 1.4 2016/04/04 07:37:08 ozaki-r Exp $
+# $NetBSD: t_route.sh,v 1.5 2016/06/21 05:04:16 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -53,15 +53,15 @@ DEBUG=false
TIMEOUT=1
PING_OPTS="-n -c 1 -w $TIMEOUT"
-atf_test_case non_subnet_gateway cleanup
-non_subnet_gateway_head()
+atf_test_case route_non_subnet_gateway cleanup
+route_non_subnet_gateway_head()
{
atf_set "descr" "tests of a gateway not on the local subnet"
atf_set "require.progs" "rump_server"
}
-non_subnet_gateway_body()
+route_non_subnet_gateway_body()
{
atf_check -s exit:0 rump_server ${RUMP_LIBS} ${SOCK_CLIENT}
@@ -107,7 +107,7 @@ non_subnet_gateway_body()
unset RUMP_SERVER
}
-non_subnet_gateway_cleanup()
+route_non_subnet_gateway_cleanup()
{
$DEBUG && shmif_dumpbus -p - $BUS 2>/dev/null | tcpdump -n -e -r -
@@ -115,16 +115,16 @@ non_subnet_gateway_cleanup()
env RUMP_SERVER=$SOCK_GW rump.halt
}
-atf_test_case command_get cleanup
-atf_test_case command_get6 cleanup
-command_get_head()
+atf_test_case route_command_get cleanup
+atf_test_case route_command_get6 cleanup
+route_command_get_head()
{
atf_set "descr" "tests of route get command"
atf_set "require.progs" "rump_server"
}
-command_get6_head()
+route_command_get6_head()
{
atf_set "descr" "tests of route get command (IPv6)"
@@ -373,7 +373,7 @@ destination: fc00:0:0:1::
atf_check -s exit:0 diff ./expect ./output
}
-command_get_body()
+route_command_get_body()
{
setup
@@ -381,7 +381,7 @@ command_get_body()
test_route_get
}
-command_get6_body()
+route_command_get6_body()
{
setup6
@@ -408,13 +408,13 @@ cleanup()
env RUMP_SERVER=$SOCKDST rump.halt
}
-command_get_cleanup()
+route_command_get_cleanup()
{
$DEBUG && dump
cleanup
}
-command_get6_cleanup()
+route_command_get6_cleanup()
{
dump
cleanup
@@ -423,7 +423,7 @@ command_get6_cleanup()
atf_init_test_cases()
{
- atf_add_test_case non_subnet_gateway
- atf_add_test_case command_get
- atf_add_test_case command_get6
+ atf_add_test_case route_non_subnet_gateway
+ atf_add_test_case route_command_get
+ atf_add_test_case route_command_get6
}
