Module Name: src
Committed By: ozaki-r
Date: Mon Nov 7 05:25:37 UTC 2016
Modified Files:
src/tests/net/arp: t_arp.sh t_dad.sh
src/tests/net/icmp: t_icmp6_redirect.sh t_icmp_redirect.sh
src/tests/net/if_pppoe: t_pppoe.sh
src/tests/net/if_tap: t_tap.sh
src/tests/net/if_tun: t_tun.sh
src/tests/net/mcast: t_mcast.sh
src/tests/net/ndp: t_dad.sh t_ndp.sh t_ra.sh
src/tests/net/net: t_forwarding.sh t_ipaddress.sh t_ipv6_lifetime.sh
t_ipv6address.sh t_mtudisc.sh t_ping6_opts.sh
src/tests/net/route: t_change.sh t_flags.sh t_flags6.sh t_route.sh
Log Message:
Accept DEBUG environment variable
By doing so, we can easily turn DEBUG on/off without modifying
the ATF scripts.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/tests/net/arp/t_arp.sh
cvs rdiff -u -r1.8 -r1.9 src/tests/net/arp/t_dad.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/icmp/t_icmp6_redirect.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/net/icmp/t_icmp_redirect.sh
cvs rdiff -u -r1.9 -r1.10 src/tests/net/if_pppoe/t_pppoe.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/net/if_tap/t_tap.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/net/if_tun/t_tun.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/net/mcast/t_mcast.sh
cvs rdiff -u -r1.8 -r1.9 src/tests/net/ndp/t_dad.sh
cvs rdiff -u -r1.13 -r1.14 src/tests/net/ndp/t_ndp.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/ndp/t_ra.sh
cvs rdiff -u -r1.15 -r1.16 src/tests/net/net/t_forwarding.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/net/t_ipaddress.sh \
src/tests/net/net/t_ipv6_lifetime.sh
cvs rdiff -u -r1.9 -r1.10 src/tests/net/net/t_ipv6address.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/net/net/t_mtudisc.sh \
src/tests/net/net/t_ping6_opts.sh
cvs rdiff -u -r1.8 -r1.9 src/tests/net/route/t_change.sh \
src/tests/net/route/t_flags6.sh
cvs rdiff -u -r1.11 -r1.12 src/tests/net/route/t_flags.sh
cvs rdiff -u -r1.7 -r1.8 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.17 src/tests/net/arp/t_arp.sh:1.18
--- src/tests/net/arp/t_arp.sh:1.17 Tue Aug 23 16:03:45 2016
+++ src/tests/net/arp/t_arp.sh Mon Nov 7 05:25:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_arp.sh,v 1.17 2016/08/23 16:03:45 christos Exp $
+# $NetBSD: t_arp.sh,v 1.18 2016/11/07 05:25:36 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -36,7 +36,7 @@ IP4DST=10.0.1.2
IP4DST_PROXYARP1=10.0.1.3
IP4DST_PROXYARP2=10.0.1.4
-DEBUG=false
+DEBUG=${DEBUG:-false}
TIMEOUT=1
atf_test_case arp_cache_expiration_5s cleanup
Index: src/tests/net/arp/t_dad.sh
diff -u src/tests/net/arp/t_dad.sh:1.8 src/tests/net/arp/t_dad.sh:1.9
--- src/tests/net/arp/t_dad.sh:1.8 Wed Sep 14 16:00:10 2016
+++ src/tests/net/arp/t_dad.sh Mon Nov 7 05:25:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_dad.sh,v 1.8 2016/09/14 16:00:10 christos Exp $
+# $NetBSD: t_dad.sh,v 1.9 2016/11/07 05:25:36 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -32,7 +32,7 @@ HIJACKING="env LD_PRELOAD=/usr/lib/libru
SOCKLOCAL=unix://commsock1
SOCKPEER=unix://commsock2
-DEBUG=false
+DEBUG=${DEBUG:-false}
atf_test_case dad_basic cleanup
atf_test_case dad_duplicated cleanup
Index: src/tests/net/icmp/t_icmp6_redirect.sh
diff -u src/tests/net/icmp/t_icmp6_redirect.sh:1.4 src/tests/net/icmp/t_icmp6_redirect.sh:1.5
--- src/tests/net/icmp/t_icmp6_redirect.sh:1.4 Thu Oct 20 09:51:15 2016
+++ src/tests/net/icmp/t_icmp6_redirect.sh Mon Nov 7 05:25:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_icmp6_redirect.sh,v 1.4 2016/10/20 09:51:15 ozaki-r Exp $
+# $NetBSD: t_icmp6_redirect.sh,v 1.5 2016/11/07 05:25:36 ozaki-r Exp $
#
# Copyright (c) 2015 Internet Initiative Japan Inc.
# All rights reserved.
@@ -44,7 +44,7 @@ IP6IF0_GW2=fc00:1::3
REDIRECT_TIMEOUT=5
-DEBUG=true
+DEBUG=${DEBUG:-true}
get_lladdr()
{
Index: src/tests/net/icmp/t_icmp_redirect.sh
diff -u src/tests/net/icmp/t_icmp_redirect.sh:1.3 src/tests/net/icmp/t_icmp_redirect.sh:1.4
--- src/tests/net/icmp/t_icmp_redirect.sh:1.3 Wed Aug 10 22:17:44 2016
+++ src/tests/net/icmp/t_icmp_redirect.sh Mon Nov 7 05:25:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_icmp_redirect.sh,v 1.3 2016/08/10 22:17:44 kre Exp $
+# $NetBSD: t_icmp_redirect.sh,v 1.4 2016/11/07 05:25:36 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -36,7 +36,7 @@ BUS=bus1
BUS2=bus2
REDIRECT_TIMEOUT=5
-DEBUG=false
+DEBUG=${DEBUG:-false}
atf_test_case icmp_redirect_timeout cleanup
Index: src/tests/net/if_pppoe/t_pppoe.sh
diff -u src/tests/net/if_pppoe/t_pppoe.sh:1.9 src/tests/net/if_pppoe/t_pppoe.sh:1.10
--- src/tests/net/if_pppoe/t_pppoe.sh:1.9 Thu Oct 27 09:59:17 2016
+++ src/tests/net/if_pppoe/t_pppoe.sh Mon Nov 7 05:25:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_pppoe.sh,v 1.9 2016/10/27 09:59:17 knakahara Exp $
+# $NetBSD: t_pppoe.sh,v 1.10 2016/11/07 05:25:36 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -42,7 +42,7 @@ SECRET=oink
BUS=bus0
TIMEOUT=3
WAITTIME=5
-DEBUG=false
+DEBUG=${DEBUG:-false}
setup()
{
Index: src/tests/net/if_tap/t_tap.sh
diff -u src/tests/net/if_tap/t_tap.sh:1.3 src/tests/net/if_tap/t_tap.sh:1.4
--- src/tests/net/if_tap/t_tap.sh:1.3 Wed Aug 10 22:42:21 2016
+++ src/tests/net/if_tap/t_tap.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_tap.sh,v 1.3 2016/08/10 22:42:21 kre Exp $
+# $NetBSD: t_tap.sh,v 1.4 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -39,7 +39,7 @@ IP6_LOCAL=fc00::1
IP6_TAP=fc00::2
IP6_REMOTE=fc00::3
-DEBUG=false
+DEBUG=${DEBUG:-false}
TIMEOUT=1
atf_test_case tap_create_destroy cleanup
Index: src/tests/net/if_tun/t_tun.sh
diff -u src/tests/net/if_tun/t_tun.sh:1.3 src/tests/net/if_tun/t_tun.sh:1.4
--- src/tests/net/if_tun/t_tun.sh:1.3 Sat Oct 1 20:18:06 2016
+++ src/tests/net/if_tun/t_tun.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_tun.sh,v 1.3 2016/10/01 20:18:06 kre Exp $
+# $NetBSD: t_tun.sh,v 1.4 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -34,7 +34,7 @@ SOCK_REMOTE=unix://commsock2
IP_LOCAL=10.0.0.1
IP_REMOTE=10.0.0.2
-DEBUG=true
+DEBUG=${DEBUG:-true}
atf_test_case tun_create_destroy cleanup
tun_create_destroy_head()
Index: src/tests/net/mcast/t_mcast.sh
diff -u src/tests/net/mcast/t_mcast.sh:1.2 src/tests/net/mcast/t_mcast.sh:1.3
--- src/tests/net/mcast/t_mcast.sh:1.2 Wed Aug 10 22:45:39 2016
+++ src/tests/net/mcast/t_mcast.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_mcast.sh,v 1.2 2016/08/10 22:45:39 kre Exp $
+# $NetBSD: t_mcast.sh,v 1.3 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,7 +30,7 @@ netserver="$netserver -lrumpnet_netinet
netserver="$netserver -lrumpdev"
export RUMP_SERVER=unix://commsock
-DEBUG=false
+DEBUG=${DEBUG:-false}
run_test()
{
Index: src/tests/net/ndp/t_dad.sh
diff -u src/tests/net/ndp/t_dad.sh:1.8 src/tests/net/ndp/t_dad.sh:1.9
--- src/tests/net/ndp/t_dad.sh:1.8 Tue Oct 4 03:41:33 2016
+++ src/tests/net/ndp/t_dad.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_dad.sh,v 1.8 2016/10/04 03:41:33 ozaki-r Exp $
+# $NetBSD: t_dad.sh,v 1.9 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,7 +33,7 @@ HIJACKING="env LD_PRELOAD=/usr/lib/libru
SOCKLOCAL=unix://commsock1
SOCKPEER=unix://commsock2
-DEBUG=false
+DEBUG=${DEBUG:-false}
duplicated="[Dd][Uu][Pp][Ll][Ii][Cc][Aa][Tt][Ee][Dd]"
Index: src/tests/net/ndp/t_ndp.sh
diff -u src/tests/net/ndp/t_ndp.sh:1.13 src/tests/net/ndp/t_ndp.sh:1.14
--- src/tests/net/ndp/t_ndp.sh:1.13 Wed Aug 10 23:07:57 2016
+++ src/tests/net/ndp/t_ndp.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ndp.sh,v 1.13 2016/08/10 23:07:57 kre Exp $
+# $NetBSD: t_ndp.sh,v 1.14 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,7 +35,7 @@ SOCKDST=unix://commsock2
IP6SRC=fc00::1
IP6DST=fc00::2
-DEBUG=true
+DEBUG=${DEBUG:-true}
TIMEOUT=1
atf_test_case ndp_cache_expiration cleanup
Index: src/tests/net/ndp/t_ra.sh
diff -u src/tests/net/ndp/t_ra.sh:1.4 src/tests/net/ndp/t_ra.sh:1.5
--- src/tests/net/ndp/t_ra.sh:1.4 Thu Oct 20 09:51:15 2016
+++ src/tests/net/ndp/t_ra.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ra.sh,v 1.4 2016/10/20 09:51:15 ozaki-r Exp $
+# $NetBSD: t_ra.sh,v 1.5 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2015 Internet Initiative Japan Inc.
# All rights reserved.
@@ -35,7 +35,7 @@ IP6SRV=fc00:1::1
IP6CLI=fc00:2::2
PIDFILE=/var/run/rump.rtadvd.pid
CONFIG=./rtadvd.conf
-DEBUG=true
+DEBUG=${DEBUG:-true}
setup_shmif0()
{
Index: src/tests/net/net/t_forwarding.sh
diff -u src/tests/net/net/t_forwarding.sh:1.15 src/tests/net/net/t_forwarding.sh:1.16
--- src/tests/net/net/t_forwarding.sh:1.15 Wed Aug 10 21:33:52 2016
+++ src/tests/net/net/t_forwarding.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_forwarding.sh,v 1.15 2016/08/10 21:33:52 kre Exp $
+# $NetBSD: t_forwarding.sh,v 1.16 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -43,7 +43,7 @@ IP6DST=fc00:0:0:2::2
HTTPD_PID=httpd.pid
HTML_FILE=index.html
-DEBUG=false
+DEBUG=${DEBUG:-false}
TIMEOUT=5
atf_test_case ipforwarding_v4 cleanup
Index: src/tests/net/net/t_ipaddress.sh
diff -u src/tests/net/net/t_ipaddress.sh:1.4 src/tests/net/net/t_ipaddress.sh:1.5
--- src/tests/net/net/t_ipaddress.sh:1.4 Tue Oct 4 03:43:15 2016
+++ src/tests/net/net/t_ipaddress.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipaddress.sh,v 1.4 2016/10/04 03:43:15 ozaki-r Exp $
+# $NetBSD: t_ipaddress.sh,v 1.5 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2015 Internet Initiative Japan Inc.
# All rights reserved.
@@ -30,7 +30,7 @@ SERVER6="$SERVER -lrumpnet_netinet6"
SOCK_LOCAL=unix://commsock1
BUS=bus
-DEBUG=false
+DEBUG=${DEBUG:-false}
check_entry()
{
Index: src/tests/net/net/t_ipv6_lifetime.sh
diff -u src/tests/net/net/t_ipv6_lifetime.sh:1.4 src/tests/net/net/t_ipv6_lifetime.sh:1.5
--- src/tests/net/net/t_ipv6_lifetime.sh:1.4 Sun Oct 2 15:27:32 2016
+++ src/tests/net/net/t_ipv6_lifetime.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipv6_lifetime.sh,v 1.4 2016/10/02 15:27:32 kre Exp $
+# $NetBSD: t_ipv6_lifetime.sh,v 1.5 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -31,7 +31,7 @@ INET6SERVER="$INET6SERVER -lrumpnet_neti
SOCK=unix://sock
BUS=./bus
-DEBUG=false
+DEBUG=${DEBUG:-false}
deprecated="[Dd][Ee][Pp][Rr][Ee][Cc][Aa][Tt][Ee][Dd]"
Index: src/tests/net/net/t_ipv6address.sh
diff -u src/tests/net/net/t_ipv6address.sh:1.9 src/tests/net/net/t_ipv6address.sh:1.10
--- src/tests/net/net/t_ipv6address.sh:1.9 Mon Oct 3 17:59:27 2016
+++ src/tests/net/net/t_ipv6address.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipv6address.sh,v 1.9 2016/10/03 17:59:27 kre Exp $
+# $NetBSD: t_ipv6address.sh,v 1.10 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2015 Internet Initiative Japan Inc.
# All rights reserved.
@@ -41,7 +41,7 @@ BUS2=bus2
BUSSRC=bus_src
BUSDST=bus_dst
-DEBUG=true
+DEBUG=${DEBUG:-true}
TIMEOUT=3
atf_test_case linklocal cleanup
Index: src/tests/net/net/t_mtudisc.sh
diff -u src/tests/net/net/t_mtudisc.sh:1.2 src/tests/net/net/t_mtudisc.sh:1.3
--- src/tests/net/net/t_mtudisc.sh:1.2 Thu Oct 6 02:44:48 2016
+++ src/tests/net/net/t_mtudisc.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_mtudisc.sh,v 1.2 2016/10/06 02:44:48 kre Exp $
+# $NetBSD: t_mtudisc.sh,v 1.3 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -36,7 +36,7 @@ SOCKREMOTE=unix://commsock3
HTTPD_PID=httpd.pid
HTML_FILE=index.html
-DEBUG=false
+DEBUG=${DEBUG:-false}
atf_test_case mtudisc_basic cleanup
Index: src/tests/net/net/t_ping6_opts.sh
diff -u src/tests/net/net/t_ping6_opts.sh:1.2 src/tests/net/net/t_ping6_opts.sh:1.3
--- src/tests/net/net/t_ping6_opts.sh:1.2 Mon Nov 7 04:43:14 2016
+++ src/tests/net/net/t_ping6_opts.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ping6_opts.sh,v 1.2 2016/11/07 04:43:14 ozaki-r Exp $
+# $NetBSD: t_ping6_opts.sh,v 1.3 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -41,7 +41,7 @@ BUS_DSTGW=bus2
IP6SRC2=fc00:0:0:1::3
IP6SRCGW2=fc00:0:0:1::254
-DEBUG=false
+DEBUG=${DEBUG:-false}
TIMEOUT=1
#
Index: src/tests/net/route/t_change.sh
diff -u src/tests/net/route/t_change.sh:1.8 src/tests/net/route/t_change.sh:1.9
--- src/tests/net/route/t_change.sh:1.8 Wed Aug 10 23:00:39 2016
+++ src/tests/net/route/t_change.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_change.sh,v 1.8 2016/08/10 23:00:39 roy Exp $
+# $NetBSD: t_change.sh,v 1.9 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,7 +30,7 @@ netserver=\
-lrumpnet_netinet -lrumpnet_shmif"
export RUMP_SERVER=unix://commsock
-DEBUG=false
+DEBUG=${DEBUG:-false}
atf_test_case route_change_reject2blackhole cleanup
route_change_reject2blackhole_head()
Index: src/tests/net/route/t_flags6.sh
diff -u src/tests/net/route/t_flags6.sh:1.8 src/tests/net/route/t_flags6.sh:1.9
--- src/tests/net/route/t_flags6.sh:1.8 Tue Aug 16 10:34:12 2016
+++ src/tests/net/route/t_flags6.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_flags6.sh,v 1.8 2016/08/16 10:34:12 roy Exp $
+# $NetBSD: t_flags6.sh,v 1.9 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -37,7 +37,7 @@ BUS2=bus2
IP6_LOCAL=fc00::2
IP6_PEER=fc00::1
-DEBUG=false
+DEBUG=${DEBUG:-false}
setup_local()
{
Index: src/tests/net/route/t_flags.sh
diff -u src/tests/net/route/t_flags.sh:1.11 src/tests/net/route/t_flags.sh:1.12
--- src/tests/net/route/t_flags.sh:1.11 Wed Aug 10 23:00:39 2016
+++ src/tests/net/route/t_flags.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_flags.sh,v 1.11 2016/08/10 23:00:39 roy Exp $
+# $NetBSD: t_flags.sh,v 1.12 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,7 +34,7 @@ SOCK_GW=unix://commsock3
BUS=bus1
BUS2=bus2
-DEBUG=false
+DEBUG=${DEBUG:-false}
setup_local()
{
Index: src/tests/net/route/t_route.sh
diff -u src/tests/net/route/t_route.sh:1.7 src/tests/net/route/t_route.sh:1.8
--- src/tests/net/route/t_route.sh:1.7 Wed Aug 10 23:00:39 2016
+++ src/tests/net/route/t_route.sh Mon Nov 7 05:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_route.sh,v 1.7 2016/08/10 23:00:39 roy Exp $
+# $NetBSD: t_route.sh,v 1.8 2016/11/07 05:25:37 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -49,7 +49,7 @@ IP6DST=fc00:0:0:2::2
BUS_SRCGW=bus1
BUS_DSTGW=bus2
-DEBUG=false
+DEBUG=${DEBUG:-false}
TIMEOUT=1
PING_OPTS="-n -c 1 -w $TIMEOUT"
