removed some unnecessary greps

diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh
old mode 100644 (file)
new mode 100755 (executable)
index 47ef63f..3566b9c
--- a/bin/tests/system/cacheclean/tests.sh
+++ b/bin/tests/system/cacheclean/tests.sh
@@ -81,7 +81,6 @@ in_cache () {
 n=`expr $n + 1`
 echo_i "check correctness of routine cache cleaning ($n)"
 $DIG $DIGOPTS +tcp +keepopen -b 10.53.0.7 -f dig.batch > dig.out.ns2 || status=1
-grep ";" dig.out.ns2
 
 $PERL ../digcomp.pl --lc dig.out.ns2 knowngood.dig.out || status=1
 

diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
old mode 100644 (file)
new mode 100755 (executable)
index d946d48..542ad1c
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -301,7 +301,6 @@ sub verify_server {
                my $return = system("$DIG $tcp +noadd +nosea +nostat +noquest +nocomm +nocmd +noedns -p $port version.bind. chaos txt \@10.53.0.$n > dig.out");
                last if ($return == 0);
                if (++$tries >= 30) {
-                       print `grep ";" dig.out > /dev/null`;
                        print "I:no response from $server\n";
                        print "I:failed\n";
                        system("$PERL $topdir/stop.pl $testdir");

diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index c1610095a69cc2aeb614489d9bdd7556b5234956..47f04d712ee481f2c14e7a4b18f18b62214f4633 100644 (file)
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -17,11 +17,9 @@ status=0
 
 echo_i "fetching a.example from ns2's initial configuration"
 $DIG $DIGOPTS a.example. @10.53.0.2 any > dig.out.ns2.1 || status=1
-grep ";" dig.out.ns2.1 # XXXDCL why is this here?
 
 echo_i "fetching a.example from ns3's initial configuration"
 $DIG $DIGOPTS a.example. @10.53.0.3 any > dig.out.ns3.1 || status=1
-grep ";" dig.out.ns3.1 # XXXDCL why is this here?
 
 echo_i "copying in new configurations for ns2 and ns3"
 rm -f ns2/named.conf ns3/named.conf ns2/example.db
@@ -46,15 +44,12 @@ done
 
 echo_i "fetching a.example from ns2's 10.53.0.4, source address 10.53.0.4"
 $DIG $DIGOPTS -b 10.53.0.4 a.example. @10.53.0.4 any > dig.out.ns4.2 || status=1
-grep ";" dig.out.ns4.2 # XXXDCL why is this here?
 
 echo_i "fetching a.example from ns2's 10.53.0.2, source address 10.53.0.2"
 $DIG $DIGOPTS -b 10.53.0.2 a.example. @10.53.0.2 any > dig.out.ns2.2 || status=1
-grep ";" dig.out.ns2.2 # XXXDCL why is this here?
 
 echo_i "fetching a.example from ns3's 10.53.0.3, source address defaulted"
 $DIG $DIGOPTS @10.53.0.3 a.example. any > dig.out.ns3.2 || status=1
-grep ";" dig.out.ns3.2 # XXXDCL why is this here?
 
 echo_i "comparing ns3's initial a.example to one from reconfigured 10.53.0.2"
 $PERL ../digcomp.pl dig.out.ns3.1 dig.out.ns2.2 || status=1

diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
old mode 100644 (file)
new mode 100755 (executable)
index e9d762a..727bc12
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -19,7 +19,7 @@ n=`expr $n + 1`
 echo_i "testing basic zone transfer functionality"
 $DIG $DIGOPTS example. \
        @10.53.0.2 axfr > dig.out.ns2 || status=1
-grep "^;" dig.out.ns2
+grep "^;" dig.out.ns2 | cat_i
 
 #
 # Spin to allow the zone to tranfer.
@@ -35,7 +35,7 @@ $DIG $DIGOPTS example. \
        sleep 5
 done
 if test $tmp -eq 1 ; then status=1; fi
-grep "^;" dig.out.ns3
+grep "^;" dig.out.ns3 | cat_i
 
 $PERL ../digcomp.pl dig1.good dig.out.ns2 || status=1
 
@@ -44,7 +44,7 @@ $PERL ../digcomp.pl dig1.good dig.out.ns3 || status=1
 n=`expr $n + 1`
 echo_i "testing TSIG signed zone transfers"
 $DIG $DIGOPTS tsigzone. @10.53.0.2 axfr -y tsigzone.:1234abcd8765 > dig.out.ns2 || status=1
-grep "^;" dig.out.ns2
+grep "^;" dig.out.ns2 | cat_i
 
 #
 # Spin to allow the zone to tranfer.
@@ -59,7 +59,7 @@ tmp=0
        sleep 5
 done
 if test $tmp -eq 1 ; then status=1; fi
-grep "^;" dig.out.ns3
+grep "^;" dig.out.ns3 | cat_i
 
 $PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1
 
@@ -125,7 +125,7 @@ done
 
 $DIG $DIGOPTS example. \
        @10.53.0.3 axfr > dig.out.ns3 || tmp=1
-grep "^;" dig.out.ns3
+grep "^;" dig.out.ns3 | cat_i
 
 $PERL ../digcomp.pl dig2.good dig.out.ns3 || tmp=1
 
@@ -142,11 +142,11 @@ tmp=0
 
 $DIG $DIGOPTS master. \
        @10.53.0.6 axfr > dig.out.ns6 || tmp=1
-grep "^;" dig.out.ns6
+grep "^;" dig.out.ns6 | cat_i
 
 $DIG $DIGOPTS master. \
        @10.53.0.3 axfr > dig.out.ns3 || tmp=1
-grep "^;" dig.out.ns3 && cat dig.out.ns3
+grep "^;" dig.out.ns3 > /dev/null && cat_i dig.out.ns3
 
 $PERL ../digcomp.pl dig.out.ns6 dig.out.ns3 || tmp=1
 
@@ -163,11 +163,11 @@ tmp=0
 
 $DIG $DIGOPTS slave. \
        @10.53.0.6 axfr > dig.out.ns6 || tmp=1
-grep "^;" dig.out.ns6
+grep "^;" dig.out.ns6 | cat_i
 
 $DIG $DIGOPTS slave. \
        @10.53.0.1 axfr > dig.out.ns1 || tmp=1
-grep "^;" dig.out.ns1
+grep "^;" dig.out.ns1 | cat_i
 
 $PERL ../digcomp.pl dig.out.ns6 dig.out.ns1 || tmp=1
 
@@ -195,11 +195,11 @@ tmp=0
 
 $DIG $DIGOPTS slave. \
        @10.53.0.1 axfr > dig.out.ns1 || tmp=1
-grep "^;" dig.out.ns1
+grep "^;" dig.out.ns1 | cat_i
 
 $DIG $DIGOPTS slave. \
        @10.53.0.7 axfr > dig.out.ns7 || tmp=1
-grep "^;" dig.out.ns1
+grep "^;" dig.out.ns1 | cat_i
 
 $PERL ../digcomp.pl dig.out.ns7 dig.out.ns1 || tmp=1
 

diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh
old mode 100644 (file)
new mode 100755 (executable)
index 5dab132..f1ec0cb
--- a/bin/tests/system/xferquota/tests.sh
+++ b/bin/tests/system/xferquota/tests.sh
@@ -42,20 +42,16 @@ done
 status=0
 
 $DIG $DIGOPTS zone000099.example. @10.53.0.1 axfr > dig.out.ns1 || status=1
-grep ";" dig.out.ns1
 
 $DIG $DIGOPTS zone000099.example. @10.53.0.2 axfr > dig.out.ns2 || status=1
-grep ";" dig.out.ns2
 
 $PERL ../digcomp.pl dig.out.ns1 dig.out.ns2 || status=1
 
 sleep 15
 
 $DIG $DIGOPTS a.changing. @10.53.0.1 a > dig.out.ns1 || status=1
-grep ";" dig.out.ns1
 
 $DIG $DIGOPTS a.changing. @10.53.0.2 a > dig.out.ns2 || status=1
-grep ";" dig.out.ns2
 
 $PERL ../digcomp.pl dig.out.ns1 dig.out.ns2 || status=1