From: Evan Hunt Date: Sun, 25 Feb 2018 07:56:54 +0000 (-0800) Subject: removed some unnecessary greps X-Git-Tag: v9.10.8rc1~83^2~4 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=539be337d9b28a6bf7e5ac486b1513bba9f61247;p=thirdparty%2Fbind9.git removed some unnecessary greps (cherry picked from commit 731ad28be2a0a9705da2357d1051dad246dd8467) (cherry picked from commit 17245b86d5a4fbbf6826214166f6417d099761e5) (cherry picked from commit 350f18b0d1d203b1ffe7fe3cf049350f74b52c39) --- diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh old mode 100644 new mode 100755 index 4b3d80ab03a..24b77dcc875 --- a/bin/tests/system/cacheclean/tests.sh +++ b/bin/tests/system/cacheclean/tests.sh @@ -90,7 +90,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 new mode 100755 index 71311b41e82..a05900a28dd --- a/bin/tests/system/start.pl +++ b/bin/tests/system/start.pl @@ -15,8 +15,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: start.pl,v 1.30 2012/02/06 23:46:44 tbox Exp $ - # Framework for starting test servers. # Based on the type of server specified, check for port availability, remove # temporary files, start the server, and verify that the server is running. @@ -340,7 +338,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 8d886baa791..ad901eed50c 100644 --- a/bin/tests/system/views/tests.sh +++ b/bin/tests/system/views/tests.sh @@ -26,11 +26,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 @@ -55,15 +53,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 new mode 100755 index 4c5758259c6..f1ae81eb45c --- a/bin/tests/system/xfer/tests.sh +++ b/bin/tests/system/xfer/tests.sh @@ -28,7 +28,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. @@ -44,7 +44,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 @@ -53,7 +53,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. @@ -68,7 +68,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 @@ -134,7 +134,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 @@ -151,11 +151,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 @@ -172,11 +172,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 @@ -204,11 +204,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 new mode 100755 index 85ce4ddd151..5727cae1583 --- a/bin/tests/system/xferquota/tests.sh +++ b/bin/tests/system/xferquota/tests.sh @@ -51,20 +51,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