Module Name: src
Committed By: ozaki-r
Date: Fri Mar 3 07:34:04 UTC 2017
Modified Files:
src/tests/net: net_common.sh
src/tests/net/ndp: t_ndp.sh t_ra.sh
Log Message:
Provide a more robust regexp for time formats of 1day-ish
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/net/net_common.sh
cvs rdiff -u -r1.17 -r1.18 src/tests/net/ndp/t_ndp.sh
cvs rdiff -u -r1.25 -r1.26 src/tests/net/ndp/t_ra.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/net_common.sh
diff -u src/tests/net/net_common.sh:1.12 src/tests/net/net_common.sh:1.13
--- src/tests/net/net_common.sh:1.12 Thu Feb 16 08:12:47 2017
+++ src/tests/net/net_common.sh Fri Mar 3 07:34:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: net_common.sh,v 1.12 2017/02/16 08:12:47 ozaki-r Exp $
+# $NetBSD: net_common.sh,v 1.13 2017/03/03 07:34:04 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -31,6 +31,7 @@
HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so \
RUMPHIJACK=path=/rump,socket=all:nolocal,sysctl=yes"
+ONEDAYISH="(23h5[0-9]m|1d0h0m)[0-9]+s"
extract_new_packets()
{
Index: src/tests/net/ndp/t_ndp.sh
diff -u src/tests/net/ndp/t_ndp.sh:1.17 src/tests/net/ndp/t_ndp.sh:1.18
--- src/tests/net/ndp/t_ndp.sh:1.17 Fri Nov 25 08:51:17 2016
+++ src/tests/net/ndp/t_ndp.sh Fri Mar 3 07:34:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: t_ndp.sh,v 1.17 2016/11/25 08:51:17 ozaki-r Exp $
+# $NetBSD: t_ndp.sh,v 1.18 2017/03/03 07:34:04 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -137,7 +137,7 @@ ndp_cache_expiration_body()
$DEBUG && rump.ndp -n -a
atf_check -s exit:0 -o match:'permanent' rump.ndp -n $IP6SRC
# Expired but remains until GC sweaps it (1 day)
- atf_check -s exit:0 -o match:'(1d0h0m|23h59m)' rump.ndp -n $IP6DST
+ atf_check -s exit:0 -o match:"$ONEDAYISH" rump.ndp -n $IP6DST
rump_server_destroy_ifaces
}
Index: src/tests/net/ndp/t_ra.sh
diff -u src/tests/net/ndp/t_ra.sh:1.25 src/tests/net/ndp/t_ra.sh:1.26
--- src/tests/net/ndp/t_ra.sh:1.25 Wed Feb 22 03:03:37 2017
+++ src/tests/net/ndp/t_ra.sh Fri Mar 3 07:34:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: t_ra.sh,v 1.25 2017/02/22 03:03:37 ozaki-r Exp $
+# $NetBSD: t_ra.sh,v 1.26 2017/03/03 07:34:04 ozaki-r Exp $
#
# Copyright (c) 2015 Internet Initiative Japan Inc.
# All rights reserved.
@@ -147,7 +147,7 @@ check_entries()
atf_check -s exit:0 -o match:"${ll_srv}%shmif0 \(reachable\)" rump.ndp -p
atf_check -s exit:0 -o match:'linkmtu=1300' rump.ndp -n -i shmif0
atf_check -s exit:0 \
- -o match:"$ll_srv%shmif0 +$mac_srv +shmif0 +(23h59m|1d0h0m)..s S R" \
+ -o match:"$ll_srv%shmif0 +$mac_srv +shmif0 +$ONEDAYISH S R" \
rump.ndp -n -a
atf_check -s exit:0 -o match:$addr_prefix rump.ndp -n -a
atf_check -s exit:0 \
@@ -276,7 +276,7 @@ ra_flush_prefix_entries_body()
atf_check -s exit:0 -o match:'if=shmif0' rump.ndp -r
atf_check -s exit:0 -o empty rump.ndp -p
atf_check -s exit:0 -o match:'linkmtu=1300' rump.ndp -n -i shmif0
- atf_check -s exit:0 -o match:'(23h59m|1d0h0m)..s S R' rump.ndp -n -a
+ atf_check -s exit:0 -o match:"$ONEDAYISH S R" rump.ndp -n -a
atf_check -s exit:0 -o match:'fc00:1:' rump.ndp -n -a
atf_check -s exit:0 -o not-match:'fc00:1:' rump.ifconfig shmif0 inet6
unset RUMP_SERVER
@@ -334,7 +334,7 @@ ra_flush_defrouter_entries_body()
atf_check -s exit:0 -o empty rump.ndp -r
atf_check -s exit:0 -o match:'No advertising router' rump.ndp -p
atf_check -s exit:0 -o match:'linkmtu=1300' rump.ndp -n -i shmif0
- atf_check -s exit:0 -o match:'(23h59m|1d0h0m)..s S R' rump.ndp -n -a
+ atf_check -s exit:0 -o match:"$ONEDAYISH S R" rump.ndp -n -a
atf_check -s exit:0 -o match:'fc00:1:' rump.ndp -n -a
atf_check -s exit:0 -o match:'fc00:1:' rump.ifconfig shmif0 inet6
unset RUMP_SERVER
@@ -762,7 +762,7 @@ ra_defrouter_expiration_body()
atf_check -s exit:0 -o not-match:'if=shmif0' rump.ndp -r
atf_check -s exit:0 -o match:'No advertising router' rump.ndp -p
atf_check -s exit:0 -o match:'linkmtu=1300' rump.ndp -n -i shmif0
- atf_check -s exit:0 -o match:'(23h59m|1d0h0m)..s S R' rump.ndp -n -a
+ atf_check -s exit:0 -o match:"$ONEDAYISH S R" rump.ndp -n -a
atf_check -s exit:0 -o match:'fc00:1:' rump.ndp -n -a
atf_check -s exit:0 -o match:'fc00:1:' rump.ifconfig shmif0 inet6
unset RUMP_SERVER
@@ -827,7 +827,7 @@ ra_prefix_expiration_body()
atf_check -s exit:0 -o match:'if=shmif0' rump.ndp -r
atf_check -s exit:0 -o empty rump.ndp -p
atf_check -s exit:0 -o match:'linkmtu=1300' rump.ndp -n -i shmif0
- atf_check -s exit:0 -o match:'(23h59m|1d0h0m)..s S R' rump.ndp -n -a
+ atf_check -s exit:0 -o match:"$ONEDAYISH S R" rump.ndp -n -a
atf_check -s exit:0 -o match:'fc00:1:' rump.ndp -n -a
atf_check -s exit:0 -o not-match:'fc00:1:' rump.ifconfig shmif0 inet6
unset RUMP_SERVER
