BIND 10 trac1818, updated. f405447cfb03b02cee266e0d83e1bc57005ed61c [1818] Fix counters as dig is not called during startup verify anymore

[BIND 10 source code commits]

The branch, trac1818 has been updated
       via  f405447cfb03b02cee266e0d83e1bc57005ed61c (commit)
       via  4138f8d22d11b6a34fb6f9d85c280bff4092c50e (commit)
      from  46ef8c7fa06bea89e4528f668204e21b5651198e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f405447cfb03b02cee266e0d83e1bc57005ed61c
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Apr 2 13:46:08 2012 +0530

    [1818] Fix counters as dig is not called during startup verify anymore

commit 4138f8d22d11b6a34fb6f9d85c280bff4092c50e
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Apr 2 13:45:09 2012 +0530

    [1818] Use bindctl to verify server instead of dig

-----------------------------------------------------------------------

Summary of changes:
 tests/system/bindctl/tests.sh |    6 +++---
 tests/system/start.pl         |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/system/bindctl/tests.sh b/tests/system/bindctl/tests.sh
index 2afc56b..157e9de 100755
--- a/tests/system/bindctl/tests.sh
+++ b/tests/system/bindctl/tests.sh
@@ -57,9 +57,9 @@ sleep 2
 echo 'Stats show
 ' | $RUN_BINDCTL \
 	--csv-file-dir=$BINDCTL_CSV_DIR > bindctl.out.$n || status=1
-# the server should have received 1 UDP and 1 TCP queries (TCP query was
-# sent from the server startup script)
-cnt_value1=`expr $cnt_value1 + 1`
+# the server should have received 1 UDP and 0 TCP queries (the server
+# startup script no longer sends any TCP queries)
+cnt_value1=`expr $cnt_value1 + 0`
 cnt_value2=`expr $cnt_value2 + 1`
 cnt_value3=`expr $cnt_value1 + $cnt_value2`
 grep $cnt_name1".*\<"$cnt_value1"\>" bindctl.out.$n > /dev/null || status=1
diff --git a/tests/system/start.pl b/tests/system/start.pl
index daa4577..f280a07 100755
--- a/tests/system/start.pl
+++ b/tests/system/start.pl
@@ -53,6 +53,8 @@ if ($server && !-d "$test/$server") {
 my $topdir = abs_path("$test/..");
 my $testdir = abs_path("$test");
 my $RUN_BIND10 = $ENV{'RUN_BIND10'};
+my $RUN_BINDCTL = $ENV{'RUN_BINDCTL'};
+my $BINDCTL_CSV_DIR = $ENV{'BINDCTL_CSV_DIR'};
 my $NAMED = $ENV{'BIND9_NAMED'};
 my $LWRESD = $ENV{'LWRESD'};
 my $DIG = $ENV{'DIG'};
@@ -211,9 +213,8 @@ sub verify_server {
 
 	my $tries = 0;
 	while (1) {
-		my $return = system("$DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p 53210 version.bind. chaos txt \@10.53.0.$n > dig.out");
+		my $return = system("echo \"Stats show\" | $RUN_BINDCTL --csv-file-dir=$BINDCTL_CSV_DIR > bindctl.out");
 		last if ($return == 0);
-		print `grep ";" dig.out`;
 		if (++$tries >= 30) {
 			print "I:no response from $server\n";
 			print "R:FAIL\n";