upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 15:39:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'tkrizek-disable-delv-in-tsan-9.18' into 'bind-9.18'

Browse source 
[9.18] Disable delv tests under TSAN

See merge request isc-projects/bind9!8071
This commit is contained in:
Tom Krizek 2023-06-29 12:33:35 +00:00
commit 5cd3051793
8 changed files with 56 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/tests/system/cds/setup.sh
View file

@ -11,10 +11,12 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
set -eu
set -e
. ../conf.sh
set -u
touch empty
Z=cds.test

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

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

6
bin/tests/system/conf.sh.in
View file

@ -27,7 +27,11 @@ export ARPANAME=$TOP_BUILDDIR/bin/tools/arpaname
export CDS=$TOP_BUILDDIR/bin/dnssec/dnssec-cds
export CHECKCONF=$TOP_BUILDDIR/bin/check/named-checkconf
export CHECKZONE=$TOP_BUILDDIR/bin/check/named-checkzone
export DELV=$TOP_BUILDDIR/bin/delv/delv
if [ -z "$TSAN_OPTIONS" ]; then # workaround for GL#4119
export DELV=$TOP_BUILDDIR/bin/delv/delv
else
export DELV=:
fi
export DIG=$TOP_BUILDDIR/bin/dig/dig
export DNSTAPREAD=$TOP_BUILDDIR/bin/tools/dnstap-read
export DSFROMKEY=$TOP_BUILDDIR/bin/dnssec/dnssec-dsfromkey

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

@ -197,7 +197,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -229,7 +229,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -254,7 +254,7 @@ status=$((status+ret))
SP="[[:space:]]+"
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -280,7 +280,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -322,7 +322,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -348,7 +348,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -370,7 +370,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -393,7 +393,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -417,7 +417,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -439,7 +439,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -463,7 +463,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -487,7 +487,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -508,7 +508,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -528,7 +528,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -552,7 +552,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -576,7 +576,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -598,7 +598,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -620,7 +620,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -644,7 +644,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -668,7 +668,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -692,7 +692,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -889,7 +889,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -934,7 +934,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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
@ -953,7 +953,7 @@ n=$((n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
if [ -x ${DELV} ] ; then
if [ -x "${DELV}" ] ; then
ret=0
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

20
bin/tests/system/mkeys/tests.sh
View file

@ -111,15 +111,17 @@ grep "example..*.RRSIG..*TXT" dig.out.ns2.test$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
ret=0
echo_i "check positive validation using delv ($n)"
delv_with_opts @10.53.0.1 txt example > delv.out$n || ret=1
grep "; fully validated" delv.out$n > /dev/null || ret=1 # redundant
grep "example..*TXT.*This is a test" delv.out$n > /dev/null || ret=1
grep "example..*.RRSIG..*TXT" delv.out$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status+ret))
if [ -x "$DELV" ]; then
n=$((n+1))
ret=0
echo_i "check positive validation using delv ($n)"
delv_with_opts @10.53.0.1 txt example > delv.out$n || ret=1
grep "; fully validated" delv.out$n > /dev/null || ret=1 # redundant
grep "example..*TXT.*This is a test" delv.out$n > /dev/null || ret=1
grep "example..*.RRSIG..*TXT" delv.out$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status+ret))
fi
n=$((n+1))
echo_i "check for failed validation due to wrong key in managed-keys ($n)"

20
bin/tests/system/resolver/tests.sh
View file

@ -37,7 +37,7 @@ grep "status: NXDOMAIN" dig.out.ns1.test${n} > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
if [ -x ${RESOLVE} ] ; then
if [ -x "${RESOLVE}" ] ; then
n=$((n+1))
echo_i "checking non-cachable NXDOMAIN response handling using dns_client ($n)"
ret=0
@ -47,7 +47,7 @@ if [ -x ${RESOLVE} ] ; then
status=$((status + ret))
fi
if [ -x ${RESOLVE} ] ; then
if [ -x "${RESOLVE}" ] ; then
n=$((n+1))
echo_i "checking that local bound address can be set (Can't query from a denied address) ($n)"
ret=0
@ -73,7 +73,7 @@ grep "status: NOERROR" dig.out.ns1.test${n} > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
if [ -x ${RESOLVE} ] ; then
if [ -x "${RESOLVE}" ] ; then
n=$((n+1))
echo_i "checking non-cachable NODATA response handling using dns_client ($n)"
ret=0
@ -88,7 +88,7 @@ echo_i "checking handling of bogus referrals ($n)"
# If the server has the "INSIST(!external)" bug, this query will kill it.
dig_with_opts +tcp www.example.com. a @10.53.0.1 >/dev/null || { echo_i "failed"; status=$((status + 1)); }
if [ -x ${RESOLVE} ] ; then
if [ -x "${RESOLVE}" ] ; then
n=$((n+1))
echo_i "checking handling of bogus referrals using dns_client ($n)"
ret=0
@ -135,7 +135,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
if [ -x ${RESOLVE} ] ; then
if [ -x "${RESOLVE}" ] ; then
n=$((n+1))
echo_i "checking answer IPv4 address filtering using dns_client (accept) ($n)"
ret=0
@ -153,7 +153,7 @@ grep "status: NOERROR" dig.out.ns1.test${n} > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
if [ -x ${RESOLVE} ] ; then
if [ -x "${RESOLVE}" ] ; then
n=$((n+1))
echo_i "checking answer IPv6 address filtering using dns_client (accept) ($n)"
ret=0
@ -179,7 +179,7 @@ grep "status: NOERROR" dig.out.ns1.test${n} > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
if [ -x ${RESOLVE} ] ; then
if [ -x "${RESOLVE}" ] ; then
n=$((n+1))
echo_i "checking CNAME target filtering using dns_client (accept) ($n)"
ret=0
@ -198,7 +198,7 @@ grep "status: NOERROR" dig.out.ns1.test${n} > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
if [ -x ${RESOLVE} ] ; then
if [ -x "${RESOLVE}" ] ; then
n=$((n+1))
echo_i "checking CNAME target filtering using dns_client (accept due to subdomain) ($n)"
ret=0
@ -226,7 +226,7 @@ grep "status: NOERROR" dig.out.ns1.test${n} > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
if [ -x ${RESOLVE} ] ; then
if [ -x "${RESOLVE}" ] ; then
n=$((n+1))
echo_i "checking DNAME target filtering using dns_client (accept) ($n)"
ret=0
@ -245,7 +245,7 @@ grep "status: NOERROR" dig.out.ns1.test${n} > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
if [ -x ${RESOLVE} ] ; then
if [ -x "${RESOLVE}" ] ; then
n=$((n+1))
echo_i "checking DNAME target filtering using dns_client (accept due to subdomain) ($n)"
ret=0

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

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

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

@ -66,7 +66,7 @@ comment () {
DNSRPSCMD=./dnsrps
RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
if test -x $DNSRPSCMD; then
if test -x "$DNSRPSCMD"; then
# speed up the many delays for dnsrpzd by waiting only 0.1 seconds
WAIT_CMD="$DNSRPSCMD -w 0.1"
TEN_SECS=100