[rt46602] Miscellaneous minor fixes

... for misspellings, typos, trailing spaces, duplicated lines etc.

(cherry picked from commit 3c25e5fa02c6c77cb46fdb6ca6401d96084552ae)
(cherry picked from commit 0e2e251a0db6da5e29c1f954b3c1ef2f0677ac30)
(cherry picked from commit f55e2791fc84eae9c466893badaf2772d2280b18)

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index f52d4a59c67d654ab78048f4e6eaabb74bca3139..992d0ebe1aafbc5d80ca699738eb7cd6522d1e8a 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -52,15 +52,13 @@ feature-test@EXEEXT@: feature-test.@O@
 # used.
 
 # Define the tests that can be run in parallel.  This should be identical to
-# the definition of PARALLELDIRS in conf.sh.  These tests do not use query
-# port 5300 or control port 9953.
+# the definition of PARALLELDIRS in conf.sh.
 
 PARALLEL = allow_query rpzrecurse
 
 # Produce intermediate makefile that assigns unique port numbers to each
-# parallel test.  The sequential tests all use ports 5300 (for queries) and
-# 9953 (for control).  For this reason, the parallel tests start at port
-# # 10,000
+# parallel test.  The start port number of 5,000 is arbitrary - it must just
+# be greated that the highest privileged port, 1024.
 
 parallel.mk:
        @echo ".PHONY: $(PARALLEL)" > $@ ; \

diff --git a/bin/tests/system/README b/bin/tests/system/README
index 2b3f40a19e26dd48933f85d0ce87981cb45eed35..cdc41fcf40a1cdbdb2b082ac9a7669a9f156e350 100644 (file)
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -131,7 +131,7 @@ new tests being started as tests finish. Each test will get a unique set of
 ports, so there is no danger of tests interfering with one another.
 
 It is also possible to run the test suites from two installations of BIND on
-the same machine at the same time.  To to this:
+the same machine at the same time.  To do this:
 
 1. Each installation must have its own directory tree. The system tests create
 temporary configuration files in the test directories, so separate directory

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index e5e35e84740f350dbb4beb4527145f1e107fe7ce..80af115563fb405f1b5d9d72c5f035c8b5301e45 100644 (file)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -37,7 +37,6 @@ while getopts "knp:d:" flag; do
     esac
 done
 shift `expr $OPTIND - 1`
-OPTIND=1
 
 test $# -gt 0 || { echo "usage: $0 [-k|-n|-p <PORT>] test-directory" >&2; exit 1; }