Disable resolve checks under TSAN

The resolve binary is affected by GL#4119 which occassionally makes it
hand during system tests when running with TSAN. This is a workaround to
avoid wasting resources caused by a CI timeout for the system test tsan
jobs.

(cherry picked from commit 774b9bc629873923c62f76ef5e50656ee82ba6a7)

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 7a32210bc5f890f941bb9e857de38ceab57d77be..d5b5996473e1114f7ee7a85f09c1699cc90a3456 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -35,8 +35,10 @@ export COVERAGE=$TOP/bin/python/dnssec-coverage
 export DDNSCONFGEN=$TOP/bin/confgen/ddns-confgen
 if [ -z "$TSAN_OPTIONS" ]; then  # workaround for GL#4119
     export DELV=$TOP/bin/delv/delv
+    export RESOLVE=$TOP/bin/tests/system/resolve
 else
     export DELV=:
+    export RESOLVE=:
 fi
 export DIG=$TOP/bin/dig/dig
 export DNSTAPREAD=$TOP/bin/tools/dnstap-read
@@ -58,7 +60,6 @@ export NZD2NZF=$TOP/bin/tools/named-nzd2nzf
 export PK11DEL="$TOP/bin/pkcs11/pkcs11-destroy -s ${SLOT:-0} -p ${HSMPIN:-1234} -w 0"
 export PK11GEN="$TOP/bin/pkcs11/pkcs11-keygen -q -s ${SLOT:-0} -p ${HSMPIN:-1234}"
 export PK11LIST="$TOP/bin/pkcs11/pkcs11-list -s ${SLOT:-0} -p ${HSMPIN:-1234}"
-export RESOLVE=$TOP/bin/tests/system/resolve
 export REVOKE=$TOP/bin/dnssec/dnssec-revoke
 export RNDC=$TOP/bin/rndc/rndc
 export RNDCCONFGEN=$TOP/bin/confgen/rndc-confgen