Module Name: src
Committed By: ozaki-r
Date: Thu Apr 21 09:46:49 UTC 2016
Modified Files:
src/tests/net/route: t_flags.sh t_flags6.sh
Log Message:
Fix tests for blackhole routes
The gateway of a blackhole route must be a loopback interface.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/net/route/t_flags.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/net/route/t_flags6.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/route/t_flags.sh
diff -u src/tests/net/route/t_flags.sh:1.4 src/tests/net/route/t_flags.sh:1.5
--- src/tests/net/route/t_flags.sh:1.4 Mon Apr 4 07:37:08 2016
+++ src/tests/net/route/t_flags.sh Thu Apr 21 09:46:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_flags.sh,v 1.4 2016/04/04 07:37:08 ozaki-r Exp $
+# $NetBSD: t_flags.sh,v 1.5 2016/04/21 09:46:49 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -181,16 +181,20 @@ test_blackhole()
export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 10.0.0.1
+
# Delete an existing route first
atf_check -s exit:0 -o ignore rump.route delete -net 10.0.0.0/24
- atf_check -s exit:0 -o ignore rump.route add -net 10.0.0.0/24 10.0.0.1 -blackhole
+ # Gateway must be lo0
+ atf_check -s exit:0 -o ignore \
+ rump.route add -net 10.0.0.0/24 127.0.0.1 -blackhole
$DEBUG && rump.netstat -rn -f inet
# Up, Gateway, Blackhole, Static
check_entry_flags 10.0.0/24 UGBS
- atf_check -s not-exit:0 -o ignore -e match:'No route to host' \
+ atf_check -s not-exit:0 -o match:'100.0% packet loss' \
rump.ping -n -w 1 -c 1 10.0.0.1
$DEBUG && rump.netstat -rn -f inet
Index: src/tests/net/route/t_flags6.sh
diff -u src/tests/net/route/t_flags6.sh:1.1 src/tests/net/route/t_flags6.sh:1.2
--- src/tests/net/route/t_flags6.sh:1.1 Thu Apr 21 05:10:15 2016
+++ src/tests/net/route/t_flags6.sh Thu Apr 21 09:46:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_flags6.sh,v 1.1 2016/04/21 05:10:15 ozaki-r Exp $
+# $NetBSD: t_flags6.sh,v 1.2 2016/04/21 09:46:49 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -158,18 +158,21 @@ test_blackhole()
export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ping6 -n -X 1 -c 1 $IP6_PEER
+
# Delete an existing route first
atf_check -s exit:0 -o ignore \
rump.route delete -inet6 -net fc00::/64
+ # Gateway must be lo0
atf_check -s exit:0 -o ignore \
- rump.route add -inet6 -net fc00::/64 $IP6_PEER -blackhole
+ rump.route add -inet6 -net fc00::/64 ::1 -blackhole
$DEBUG && rump.netstat -rn -f inet6
# Up, Gateway, Blackhole, Static
check_entry_flags fc00::/64 UGBS
- atf_check -s not-exit:0 -o ignore -e match:'No route to host' \
+ atf_check -s not-exit:0 -o match:'100.0% packet loss' \
rump.ping6 -n -X 1 -c 1 $IP6_PEER
$DEBUG && rump.netstat -rn -f inet6
