From 754c7de1e91eeb28c6d3766900ead0c3e44fdb85 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 28 Apr 2024 01:51:28 +0200 Subject: Merging upstream version 1:9.16.48. Signed-off-by: Daniel Baumann --- bin/tests/system/conf.sh.in | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'bin/tests/system/conf.sh.in') diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index d5b5996..be62947 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -33,12 +33,12 @@ export CHECKDS=$TOP/bin/python/dnssec-checkds export CHECKZONE=$TOP/bin/check/named-checkzone 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 +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=: + export DELV=: + export RESOLVE=: fi export DIG=$TOP/bin/dig/dig export DNSTAPREAD=$TOP/bin/tools/dnstap-read @@ -105,8 +105,8 @@ export PSSUSPEND= # export PERL=@PERL@ if ! test -x "$PERL"; then - echo "Perl interpreter is required for system tests." - exit 77 + echo "Perl interpreter is required for system tests." + exit 77 fi export PYTHON=@PYTHON@ @@ -115,7 +115,6 @@ export PYTHON=@PYTHON@ # export CRYPTO=@CRYPTO@ - # Load common values shared between windows and unix/linux. . $TOP/bin/tests/system/conf.sh.common -- cgit v1.2.3