From 8d19e0443db60dd84f18715e8f07822ca8591f8a Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Fri, 7 Jul 2000 22:45:22 +0000 Subject: [PATCH] worked around NetBSD /bin/sh bug, making the script shorter in the process --- bin/tests/system/stub/tests.sh | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh index ff62b2193c..610f0b3f3b 100644 --- a/bin/tests/system/stub/tests.sh +++ b/bin/tests/system/stub/tests.sh @@ -15,7 +15,7 @@ # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS # SOFTWARE. -# $Id: tests.sh,v 1.5 2000/07/07 18:25:16 bwelling Exp $ +# $Id: tests.sh,v 1.6 2000/07/07 22:45:22 gson Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh @@ -24,26 +24,19 @@ SYSTEMTESTTOP=.. # Perform tests # -# sleep 5 +status=0 -status=0; $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd data.child.example. \ - @10.53.0.3 axfr -p 5300 > dig.out.ns3 -status=`expr $status + $?` -grep "; Transfer failed." dig.out.ns3 > /dev/null -status=`expr $status + $?` + @10.53.0.3 axfr -p 5300 > dig.out.ns3 || status=1 +grep "; Transfer failed." dig.out.ns3 > /dev/null || status=1 $DIG +tcp +nosea +nostat +noquest +nocomm +nocmd +norec \ - data.child.example. @10.53.0.3 txt -p 5300 > dig.out.ns3 -status=`expr $status + $?` -$PERL ../digcomp.pl knowngood.dig.out.norec dig.out.ns3 -status=`expr $status + $?` + data.child.example. @10.53.0.3 txt -p 5300 > dig.out.ns3 || status=1 +$PERL ../digcomp.pl knowngood.dig.out.norec dig.out.ns3 || status=1 $DIG +tcp +nosea +nostat +noquest +nocomm +nocmd +rec \ - data.child.example. @10.53.0.3 txt -p 5300 > dig.out.ns3 -status=`expr $status + $?` -$PERL ../digcomp.pl knowngood.dig.out.rec dig.out.ns3 -status=`expr $status + $?` + data.child.example. @10.53.0.3 txt -p 5300 > dig.out.ns3 || status=1 +$PERL ../digcomp.pl knowngood.dig.out.rec dig.out.ns3 || status=1 echo "I:exit status: $status" exit $status