Module Name: src
Committed By: ozaki-r
Date: Fri Sep 16 00:50:43 UTC 2016
Modified Files:
src/tests/net/ndp: t_dad.sh
Log Message:
Ignore case in duplicated
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/net/ndp/t_dad.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/ndp/t_dad.sh
diff -u src/tests/net/ndp/t_dad.sh:1.6 src/tests/net/ndp/t_dad.sh:1.7
--- src/tests/net/ndp/t_dad.sh:1.6 Fri Sep 16 00:14:33 2016
+++ src/tests/net/ndp/t_dad.sh Fri Sep 16 00:50:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_dad.sh,v 1.6 2016/09/16 00:14:33 ozaki-r Exp $
+# $NetBSD: t_dad.sh,v 1.7 2016/09/16 00:50:43 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,6 +35,8 @@ SOCKPEER=unix://commsock2
DEBUG=false
+duplicated="[Dd][Uu][Pp][Ll][Ii][Cc][Aa][Tt][Ee][Dd]"
+
atf_test_case dad_basic cleanup
atf_test_case dad_duplicated cleanup
@@ -180,8 +182,8 @@ dad_duplicated_body()
export RUMP_SERVER=$SOCKLOCAL
# The primary address isn't marked as duplicated
- atf_check -s exit:0 -o not-match:'DUPLICATED' \
- -x "rump.ifconfig shmif0 |grep $localip1"
+ atf_check -s exit:0 -o not-match:"$localip1.+$duplicated" \
+ rump.ifconfig shmif0
#
# Add a new address duplicated with the peer server
@@ -190,14 +192,14 @@ dad_duplicated_body()
atf_check -s exit:0 sleep 1
# The new address is marked as duplicated
- atf_check -s exit:0 -o match:'DUPLICATED' \
- -x "rump.ifconfig shmif0 |grep $peerip"
+ atf_check -s exit:0 -o match:"$peerip.+$duplicated" \
+ rump.ifconfig shmif0
# A unique address isn't marked as duplicated
atf_check -s exit:0 rump.ifconfig shmif0 inet6 $localip2
atf_check -s exit:0 sleep 1
- atf_check -s exit:0 -o not-match:'DUPLICATED' \
- -x "rump.ifconfig shmif0 |grep $localip2"
+ atf_check -s exit:0 -o not-match:"$localip2.+$duplicated" \
+ rump.ifconfig shmif0
}
cleanup()
