Source-Changes-HG archive

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

[src/trunk]: src/tests/usr.sbin/traceroute Fix test to use atf_check. My dev...



details:   https://anonhg.NetBSD.org/src/rev/0ab4664577d8
branches:  trunk
changeset: 759860:0ab4664577d8
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sat Dec 18 08:34:56 2010 +0000

description:
Fix test to use atf_check.  My development machine still had
/usr/bin/atf-check installed ....

diffstat:

 tests/usr.sbin/traceroute/t_traceroute.sh |  38 ++++++++++++++++--------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diffs (74 lines):

diff -r 0c6b3fa60cc6 -r 0ab4664577d8 tests/usr.sbin/traceroute/t_traceroute.sh
--- a/tests/usr.sbin/traceroute/t_traceroute.sh Sat Dec 18 08:20:12 2010 +0000
+++ b/tests/usr.sbin/traceroute/t_traceroute.sh Sat Dec 18 08:34:56 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_traceroute.sh,v 1.1 2010/12/15 00:13:52 pooka Exp $
+#      $NetBSD: t_traceroute.sh,v 1.2 2010/12/18 08:34:56 pooka Exp $
 #
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -41,18 +41,18 @@
        bus=${4}
 
        export RUMP_SERVER=${sock}
-       atf-check -s exit:0 rump.ifconfig shmif0 create
-       atf-check -s exit:0 rump.ifconfig shmif0 linkstr ${bus}
-       atf-check -s exit:0 rump.ifconfig shmif0 inet ${addr} netmask 0xffffff00
-       atf-check -s exit:0 -o ignore rump.route add default ${route}
+       atf_check -s exit:0 rump.ifconfig shmif0 create
+       atf_check -s exit:0 rump.ifconfig shmif0 linkstr ${bus}
+       atf_check -s exit:0 rump.ifconfig shmif0 inet ${addr} netmask 0xffffff00
+       atf_check -s exit:0 -o ignore rump.route add default ${route}
 }
 
 threeservers()
 {
 
-       atf-check -s exit:0 rump_allserver unix://commsock1
-       atf-check -s exit:0 rump_allserver unix://commsock2
-       atf-check -s exit:0 rump_allserver unix://commsock3
+       atf_check -s exit:0 rump_allserver unix://commsock1
+       atf_check -s exit:0 rump_allserver unix://commsock2
+       atf_check -s exit:0 rump_allserver unix://commsock3
 
        # configure endpoints
        cfgendpt unix://commsock1 1.2.3.4 1.2.3.1 bus1
@@ -60,13 +60,13 @@
 
        # configure the router
        export RUMP_SERVER=unix://commsock2
-       atf-check -s exit:0 rump.ifconfig shmif0 create
-       atf-check -s exit:0 rump.ifconfig shmif0 linkstr bus1
-       atf-check -s exit:0 rump.ifconfig shmif0 inet 1.2.3.1 netmask 0xffffff00
+       atf_check -s exit:0 rump.ifconfig shmif0 create
+       atf_check -s exit:0 rump.ifconfig shmif0 linkstr bus1
+       atf_check -s exit:0 rump.ifconfig shmif0 inet 1.2.3.1 netmask 0xffffff00
 
-       atf-check -s exit:0 rump.ifconfig shmif1 create
-       atf-check -s exit:0 rump.ifconfig shmif1 linkstr bus2
-       atf-check -s exit:0 rump.ifconfig shmif1 inet 2.3.4.1 netmask 0xffffff00
+       atf_check -s exit:0 rump.ifconfig shmif1 create
+       atf_check -s exit:0 rump.ifconfig shmif1 linkstr bus2
+       atf_check -s exit:0 rump.ifconfig shmif1 inet 2.3.4.1 netmask 0xffffff00
 }
 
 threecleanup()
@@ -80,12 +80,14 @@
 {
 
        threeservers
-       env RUMP_SERVER=unix://commsock1 atf-check -s exit:0    \
+       export RUMP_SERVER=unix://commsock1
+       atf_check -s exit:0     \
             -o save:tmpfile -e ignore rump.traceroute ${1} -n 2.3.4.5
-       atf-check -o inline:'1.2.3.1\n2.3.4.5\n' awk '{print $2}' < tmpfile
-       env RUMP_SERVER=unix://commsock3 atf-check -s exit:0    \
+       atf_check -o inline:'1.2.3.1\n2.3.4.5\n' awk '{print $2}' < tmpfile
+       export RUMP_SERVER=unix://commsock3
+       atf_check -s exit:0     \
             -o save:tmpfile -e ignore rump.traceroute ${1} -n 1.2.3.4
-       atf-check -o inline:'2.3.4.1\n1.2.3.4\n' awk '{print $2}' < tmpfile
+       atf_check -o inline:'2.3.4.1\n1.2.3.4\n' awk '{print $2}' < tmpfile
 }
 
 basic_body()



Home | Main Index | Thread Index | Old Index