Drop $SYSTEMTESTTOP from bin/tests/system/
The $SYSTEMTESTTOP shell variable if often set to .. in various shell scripts inside bin/tests/system/, but most of the time it is only used one line later, while sourcing conf.sh. This hardly improves code readability. $SYSTEMTESTTOP is also used for the purpose of referencing scripts/files living in bin/tests/system/, but given that the variable is always set to a short, relative path, we can drop it and replace all of its occurrences with the relative path without adversely affecting code readability.
This commit is contained in:
@@ -7,14 +7,14 @@
|
||||
# See the COPYRIGHT file distributed with this work for additional
|
||||
# information regarding copyright ownership.
|
||||
|
||||
. $SYSTEMTESTTOP/conf.sh
|
||||
. ../conf.sh
|
||||
|
||||
dig_with_opts() {
|
||||
"$DIG" -p "${PORT}" "$@"
|
||||
}
|
||||
|
||||
rndccmd() {
|
||||
"$RNDC" -c "$SYSTEMTESTTOP/common/rndc.conf" -p "${CONTROLPORT}" -s "$@"
|
||||
"$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "$@"
|
||||
}
|
||||
|
||||
status=0
|
||||
@@ -43,7 +43,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=$((status+ret))
|
||||
|
||||
echo_i "stopping ns1"
|
||||
$PERL $SYSTEMTESTTOP/stop.pl nzd2nzf ns1
|
||||
$PERL ../stop.pl nzd2nzf ns1
|
||||
|
||||
n=$((n+1))
|
||||
echo_i "dumping _default.nzd to _default.nzf ($n)"
|
||||
|
||||
Reference in New Issue
Block a user