ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

[rt46602] Miscellaneous minor fixes

Browse Source 
... for misspellings, typos, trailing spaces, duplicated lines etc.
This commit is contained in:
Stephen Morris
2017-12-14 19:13:48 +00:00
parent edc7a18d84
commit 3c25e5fa02
6 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/tests/system/Makefile.in
View File

@@ -44,15 +44,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 catz rpzrecurse serve-stale
# 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)" > $@ ; \

2
bin/tests/system/README
View File

@@ -133,7 +133,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

2
bin/tests/system/catz/tests.sh
View File

@@ -9,7 +9,7 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p $CONTROLPORT -s"
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
status=0
n=0

2
bin/tests/system/conf.sh.in
View File

@@ -186,7 +186,7 @@ then
}
echoinfo () {
COLOR=$COLOR_INFO
case "$1" in
case "$1" in
S:*|E:*) COLOR=${COLOR}${COLOR_STEN} ;; # Start/end messages
esac
printf "${COLOR}%s${COLOR_NONE}\n" "$*"

1
bin/tests/system/run.sh
View File

@@ -28,7 +28,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; }

2
bin/tests/system/serve-stale/tests.sh
View File

@@ -206,8 +206,6 @@ $DIG -p ${PORT} @10.53.0.1 data.example TXT > dig.out.test$n
grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "check stale nodata.example (serve-stale no) ($n)"