mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

Fix checking for executables in shell conditions in tests

Browse Source 
Surround the variables which are checked whether they're executable in
double quotes. Without them, empty paths won't be properly interpreted
as not executable.
This commit is contained in:
Tom Krizek
2023-06-26 17:14:16 +02:00
parent 384339dbba
commit 06056c44a7
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,7 @@ else
add_conf "## testing with DNSRPS" add_conf "## testing with DNSRPS"
fi fi
if [ ! -x $DNSRPS_CMD ]; then if [ ! -x "$DNSRPS_CMD" ]; then
add_conf "## make $DNSRPS_CMD to test DNSRPS" add_conf "## make $DNSRPS_CMD to test DNSRPS"
add_conf '#skip' add_conf '#skip'
exit 0 exit 0

48
bin/tests/system/dnssec/tests.sh
View File

@@ -197,7 +197,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking positive validation NSEC using dns_client ($n)" echo_i "checking positive validation NSEC using dns_client ($n)"
delv_with_opts @10.53.0.4 a a.example > delv.out$n || ret=1 delv_with_opts @10.53.0.4 a a.example > delv.out$n || ret=1
@@ -229,7 +229,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking positive validation NSEC3 using dns_client ($n)" echo_i "checking positive validation NSEC3 using dns_client ($n)"
delv_with_opts @10.53.0.4 a a.nsec3.example > delv.out$n || ret=1 delv_with_opts @10.53.0.4 a a.nsec3.example > delv.out$n || ret=1
@@ -254,7 +254,7 @@ status=$((status+ret))
SP="[[:space:]]+" SP="[[:space:]]+"
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking positive validation OPTOUT using dns_client ($n)" echo_i "checking positive validation OPTOUT using dns_client ($n)"
delv_with_opts @10.53.0.4 a a.optout.example > delv.out$n || ret=1 delv_with_opts @10.53.0.4 a a.optout.example > delv.out$n || ret=1
@@ -280,7 +280,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking positive wildcard validation NSEC using dns_client ($n)" echo_i "checking positive wildcard validation NSEC using dns_client ($n)"
delv_with_opts @10.53.0.4 a a.wild.example > delv.out$n || ret=1 delv_with_opts @10.53.0.4 a a.wild.example > delv.out$n || ret=1
@@ -322,7 +322,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking positive wildcard validation NSEC3 using dns_client ($n)" echo_i "checking positive wildcard validation NSEC3 using dns_client ($n)"
delv_with_opts @10.53.0.4 a a.wild.nsec3.example > delv.out$n || ret=1 delv_with_opts @10.53.0.4 a a.wild.nsec3.example > delv.out$n || ret=1
@@ -348,7 +348,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking positive wildcard validation OPTOUT using dns_client ($n)" echo_i "checking positive wildcard validation OPTOUT using dns_client ($n)"
delv_with_opts @10.53.0.4 a a.wild.optout.example > delv.out$n || ret=1 delv_with_opts @10.53.0.4 a a.wild.optout.example > delv.out$n || ret=1
@@ -370,7 +370,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking negative validation NXDOMAIN NSEC using dns_client ($n)" echo_i "checking negative validation NXDOMAIN NSEC using dns_client ($n)"
delv_with_opts @10.53.0.4 a q.example > delv.out$n 2>&1 || ret=1 delv_with_opts @10.53.0.4 a q.example > delv.out$n 2>&1 || ret=1
@@ -393,7 +393,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking negative validation NXDOMAIN NSEC3 using dns_client ($n)" echo_i "checking negative validation NXDOMAIN NSEC3 using dns_client ($n)"
delv_with_opts @10.53.0.4 a q.nsec3.example > delv.out$n 2>&1 || ret=1 delv_with_opts @10.53.0.4 a q.nsec3.example > delv.out$n 2>&1 || ret=1
@@ -417,7 +417,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking negative validation NXDOMAIN OPTOUT using dns_client ($n)" echo_i "checking negative validation NXDOMAIN OPTOUT using dns_client ($n)"
delv_with_opts @10.53.0.4 a q.optout.example > delv.out$n 2>&1 || ret=1 delv_with_opts @10.53.0.4 a q.optout.example > delv.out$n 2>&1 || ret=1
@@ -439,7 +439,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking negative validation NODATA OPTOUT using dns_client ($n)" echo_i "checking negative validation NODATA OPTOUT using dns_client ($n)"
delv_with_opts @10.53.0.4 txt a.example > delv.out$n 2>&1 || ret=1 delv_with_opts @10.53.0.4 txt a.example > delv.out$n 2>&1 || ret=1
@@ -463,7 +463,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking negative validation NODATA NSEC3 using dns_client ($n)" echo_i "checking negative validation NODATA NSEC3 using dns_client ($n)"
delv_with_opts @10.53.0.4 txt a.nsec3.example > delv.out$n 2>&1 || ret=1 delv_with_opts @10.53.0.4 txt a.nsec3.example > delv.out$n 2>&1 || ret=1
@@ -487,7 +487,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking negative validation NODATA OPTOUT using dns_client ($n)" echo_i "checking negative validation NODATA OPTOUT using dns_client ($n)"
delv_with_opts @10.53.0.4 txt a.optout.example > delv.out$n 2>&1 || ret=1 delv_with_opts @10.53.0.4 txt a.optout.example > delv.out$n 2>&1 || ret=1
@@ -508,7 +508,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking negative wildcard validation NSEC using dns_client ($n)" echo_i "checking negative wildcard validation NSEC using dns_client ($n)"
delv_with_opts @10.53.0.4 txt b.wild.example > delv.out$n 2>&1 || ret=1 delv_with_opts @10.53.0.4 txt b.wild.example > delv.out$n 2>&1 || ret=1
@@ -528,7 +528,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking negative wildcard validation NSEC3 using dns_client ($n)" echo_i "checking negative wildcard validation NSEC3 using dns_client ($n)"
delv_with_opts @10.53.0.4 txt b.wild.nsec3.example > delv.out$n 2>&1 || ret=1 delv_with_opts @10.53.0.4 txt b.wild.nsec3.example > delv.out$n 2>&1 || ret=1
@@ -552,7 +552,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking negative wildcard validation OPTOUT using dns_client ($n)" echo_i "checking negative wildcard validation OPTOUT using dns_client ($n)"
delv_with_opts @10.53.0.4 txt b.optout.nsec3.example > delv.out$n 2>&1 || ret=1 delv_with_opts @10.53.0.4 txt b.optout.nsec3.example > delv.out$n 2>&1 || ret=1
@@ -576,7 +576,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking 1-server insecurity proof NSEC using dns_client ($n)" echo_i "checking 1-server insecurity proof NSEC using dns_client ($n)"
delv_with_opts @10.53.0.4 a a.insecure.example > delv.out$n || ret=1 delv_with_opts @10.53.0.4 a a.insecure.example > delv.out$n || ret=1
@@ -598,7 +598,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking 1-server insecurity proof NSEC3 using dns_client ($n)" echo_i "checking 1-server insecurity proof NSEC3 using dns_client ($n)"
delv_with_opts @10.53.0.4 a a.insecure.nsec3.example > delv.out$n || ret=1 delv_with_opts @10.53.0.4 a a.insecure.nsec3.example > delv.out$n || ret=1
@@ -620,7 +620,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking 1-server insecurity proof OPTOUT using dns_client ($n)" echo_i "checking 1-server insecurity proof OPTOUT using dns_client ($n)"
delv_with_opts @10.53.0.4 a a.insecure.optout.example > delv.out$n || ret=1 delv_with_opts @10.53.0.4 a a.insecure.optout.example > delv.out$n || ret=1
@@ -644,7 +644,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking 1-server negative insecurity proof NSEC using dns_client ($n)" echo_i "checking 1-server negative insecurity proof NSEC using dns_client ($n)"
delv_with_opts @10.53.0.4 a q.insecure.example > delv.out$n 2>&1 || ret=1 delv_with_opts @10.53.0.4 a q.insecure.example > delv.out$n 2>&1 || ret=1
@@ -668,7 +668,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking 1-server negative insecurity proof NSEC3 using dns_client ($n)" echo_i "checking 1-server negative insecurity proof NSEC3 using dns_client ($n)"
delv_with_opts @10.53.0.4 a q.insecure.nsec3.example > delv.out$n 2>&1 || ret=1 delv_with_opts @10.53.0.4 a q.insecure.nsec3.example > delv.out$n 2>&1 || ret=1
@@ -692,7 +692,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking 1-server negative insecurity proof OPTOUT using dns_client ($n)" echo_i "checking 1-server negative insecurity proof OPTOUT using dns_client ($n)"
delv_with_opts @10.53.0.4 a q.insecure.optout.example > delv.out$n 2>&1 || ret=1 delv_with_opts @10.53.0.4 a q.insecure.optout.example > delv.out$n 2>&1 || ret=1
@@ -889,7 +889,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking failed validation using dns_client ($n)" echo_i "checking failed validation using dns_client ($n)"
delv_with_opts +cd @10.53.0.4 a a.bogus.example > delv.out$n 2>&1 || ret=1 delv_with_opts +cd @10.53.0.4 a a.bogus.example > delv.out$n 2>&1 || ret=1
@@ -934,7 +934,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking that validation fails when key record is missing using dns_client ($n)" echo_i "checking that validation fails when key record is missing using dns_client ($n)"
delv_with_opts +cd @10.53.0.4 a a.b.keyless.example > delv.out$n 2>&1 || ret=1 delv_with_opts +cd @10.53.0.4 a a.b.keyless.example > delv.out$n 2>&1 || ret=1
@@ -953,7 +953,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))
if [ -x ${DELV} ] ; then if [ -x "${DELV}" ] ; then
ret=0 ret=0
echo_i "checking that validation succeeds when a revoked key is encountered using dns_client ($n)" echo_i "checking that validation succeeds when a revoked key is encountered using dns_client ($n)"
delv_with_opts +cd @10.53.0.4 soa revkey.example > delv.out$n 2>&1 || ret=1 delv_with_opts +cd @10.53.0.4 soa revkey.example > delv.out$n 2>&1 || ret=1

2
bin/tests/system/rpz/qperf.sh
View File

@@ -13,7 +13,7 @@
for QDIR in `echo "$PATH" | tr : ' '` ../../../../contrib/queryperf; do for QDIR in `echo "$PATH" | tr : ' '` ../../../../contrib/queryperf; do
QPERF=$QDIR/queryperf QPERF=$QDIR/queryperf
if test -f $QPERF -a -x $QPERF; then if test -f "$QPERF" -a -x "$QPERF"; then
echo $QPERF echo $QPERF
exit 0 exit 0
fi fi

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

@@ -67,7 +67,7 @@ comment () {
DNSRPSCMD=./dnsrps DNSRPSCMD=./dnsrps
RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
if test -x $DNSRPSCMD; then if test -x "$DNSRPSCMD"; then
WAIT_CMD="$DNSRPSCMD -w 0.1" WAIT_CMD="$DNSRPSCMD -w 0.1"
TEN_SECS=100 TEN_SECS=100
else else