BIND 10 trac606, updated. e0d5584bdb3ca05b078693787c35d8f8f9228040 [trac606] added some note about code quality of digcomp.pl based on review comment.

[BIND 10 source code commits]

The branch, trac606 has been updated
       via  e0d5584bdb3ca05b078693787c35d8f8f9228040 (commit)
       via  4596c143eadfb9d67c5395bb6fa367470976d0cb (commit)
       via  f3bd834c8e9334004994c33d0798ed6b61a7a99b (commit)
       via  860a2965d04f80fd0e90d3c5100332a8bb2ae9d8 (commit)
       via  c4f4d32eed0f4c26e4968336179a1e749e925aa7 (commit)
      from  26582526e20e56ea4547a447cfa93e122af0f0e1 (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 e0d5584bdb3ca05b078693787c35d8f8f9228040
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Mar 4 11:46:08 2011 -0800

    [trac606] added some note about code quality of digcomp.pl based on review comment.

commit 4596c143eadfb9d67c5395bb6fa367470976d0cb
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Mar 4 11:19:33 2011 -0800

    [trac606] added an explicit check to see if BIND9_TOP is set.

commit f3bd834c8e9334004994c33d0798ed6b61a7a99b
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Mar 4 11:02:34 2011 -0800

    [trac606] make sure distclean works for a separate builddir,
    even if systest itself cannot be run for such build environment.
    also added an explicit check about the assumption in conf.sh with
    an error message explaining what's wrong.

commit 860a2965d04f80fd0e90d3c5100332a8bb2ae9d8
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Mar 4 10:30:11 2011 -0800

    [trac606] minor grammar fix

commit c4f4d32eed0f4c26e4968336179a1e749e925aa7
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Mar 4 10:29:33 2011 -0800

    [trac606] fixed a typo in README: we use make systest instead of 'test'.
    (make test is for unittests in BIND 10)

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

Summary of changes:
 Makefile.am              |    2 +-
 tests/system/Makefile.am |    4 ++--
 tests/system/README      |    4 ++--
 tests/system/conf.sh.in  |   14 ++++++++++++++
 tests/system/digcomp.pl  |    3 +++
 5 files changed, 22 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index e2203db..e31a1a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,7 +80,7 @@ cppcheck:
 # system tests
 systest:
 	cd tests/system; \
-	sh runall.sh
+	sh $(abs_srcdir)/tests/system/runall.sh
 
 #### include external sources in the distributed tarball:
 EXTRA_DIST = ext/asio/README
diff --git a/tests/system/Makefile.am b/tests/system/Makefile.am
index 44e09e0..050ee2f 100644
--- a/tests/system/Makefile.am
+++ b/tests/system/Makefile.am
@@ -1,5 +1,5 @@
 systest:
-	sh runall.sh
+	sh $(srcdir)/runall.sh
 
 distclean-local:
-	sh cleanall.sh
+	sh $(srcdir)/cleanall.sh
diff --git a/tests/system/README b/tests/system/README
index 7da8e90..3ace845 100644
--- a/tests/system/README
+++ b/tests/system/README
@@ -19,7 +19,7 @@ There are multiple test suites, each in a separate subdirectory and
 involving a different DNS setup.  They are:
 
   glue/		Glue handling tests
-(the following test are planned to be added soon)
+(the following tests are planned to be added soon)
   dnssec/	DNSSEC tests
   masterfile/	Master file parser
   xfer/		Zone transfer tests
@@ -56,7 +56,7 @@ The tests can be run individually like this:
   sh run.sh glue
   etc.
 
-To run all the tests, just type "make test" either on this directory
+To run all the tests, just type "make systest" either on this directory
 or on the top source directory.  Note: currently these tests cannot be
 run when built under a separate build directory.  Everything must be
 run within the original source tree.
diff --git a/tests/system/conf.sh.in b/tests/system/conf.sh.in
index 5c6a44d..69ebe69 100755
--- a/tests/system/conf.sh.in
+++ b/tests/system/conf.sh.in
@@ -20,6 +20,20 @@
 # other shell scripts.
 #
 
+# Prerequisite check
+if [ @srcdir@ != @builddir@ ]; then
+	echo "Currently systest doesn't work for a separate build tree."
+	echo "Rebuild BIND 10 on the source tree and run the tests."
+	exit 1
+fi
+
+if [ -z $BIND9_TOP ]; then
+	echo "systest assumes there's a compiled tree of BIND 9 which can be"
+	echo "accessed via the BIND9_TOP environment variable."
+	echo "Please make sure this assumption is met."
+	exit 1
+fi
+
 # Find the top of the source tree.
 TOP=@abs_top_srcdir@
 
diff --git a/tests/system/digcomp.pl b/tests/system/digcomp.pl
index 506e62b..f5cd7fe 100755
--- a/tests/system/digcomp.pl
+++ b/tests/system/digcomp.pl
@@ -19,6 +19,9 @@
 # Ignore "unimportant" differences, like ordering of NS lines, TTL's,
 # etc...
 
+# This is a bare copy of the script used in BIND 9's system test.  It was
+# old and may need cleanups, or we may want to rewrite it in python.
+
 $file1 = $ARGV[0];
 $file2 = $ARGV[1];