[src/trunk]: src/tests/net/ndp Adjust for new ifconfig output

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4574edc5f634
branches:  trunk
changeset: 347767:4574edc5f634
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Fri Sep 16 00:14:33 2016 +0000

description:
Adjust for new ifconfig output

And use -o match to provide informative error messages.

diffstat:

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

diffs (36 lines):

diff -r b219a32b9596 -r 4574edc5f634 tests/net/ndp/t_dad.sh
--- a/tests/net/ndp/t_dad.sh    Thu Sep 15 21:47:26 2016 +0000
+++ b/tests/net/ndp/t_dad.sh    Fri Sep 16 00:14:33 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_dad.sh,v 1.5 2016/08/10 23:07:57 kre Exp $
+#      $NetBSD: t_dad.sh,v 1.6 2016/09/16 00:14:33 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -180,7 +180,8 @@
        export RUMP_SERVER=$SOCKLOCAL
 
        # The primary address isn't marked as duplicated
-       atf_check -s not-exit:0 -x "rump.ifconfig shmif0 |grep $localip1 |grep -q duplicated"
+       atf_check -s exit:0 -o not-match:'DUPLICATED' \
+           -x "rump.ifconfig shmif0 |grep $localip1"
 
        #
        # Add a new address duplicated with the peer server
@@ -189,12 +190,14 @@
        atf_check -s exit:0 sleep 1
 
        # The new address is marked as duplicated
-       atf_check -s exit:0 -x "rump.ifconfig shmif0 |grep $peerip |grep -q duplicated"
+       atf_check -s exit:0 -o match:'DUPLICATED' \
+           -x "rump.ifconfig shmif0 |grep $peerip"
 
        # 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 not-exit:0 -x "rump.ifconfig shmif0 |grep $localip2 |grep -q duplicated"
+       atf_check -s exit:0 -o not-match:'DUPLICATED' \
+           -x "rump.ifconfig shmif0 |grep $localip2"
 }
 
 cleanup()