Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/net/ndp Ignore case in duplicated



details:   https://anonhg.NetBSD.org/src/rev/d9c09436ef41
branches:  trunk
changeset: 347769:d9c09436ef41
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Fri Sep 16 00:50:43 2016 +0000

description:
Ignore case in duplicated

diffstat:

 tests/net/ndp/t_dad.sh |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (48 lines):

diff -r 46d05c374d71 -r d9c09436ef41 tests/net/ndp/t_dad.sh
--- a/tests/net/ndp/t_dad.sh    Fri Sep 16 00:44:14 2016 +0000
+++ b/tests/net/ndp/t_dad.sh    Fri Sep 16 00:50:43 2016 +0000
@@ -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 @@
 
 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 @@
        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 @@
        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()



Home | Main Index | Thread Index | Old Index