From 4efef8cb54ce58cd80b3565bfe5418d13e3019f4 Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Mon, 26 Jun 2023 18:59:32 +0200 Subject: [PATCH] Check for unset variables only after conf.sh is loaded Make the cds/setup.sh compatible with the workaround which relies on testing the TSAN_OPTIONS variable which may not be set. (cherry picked from commit 76d9873ef6dd00eb6bd16cfe19d9972e89a9d846) --- bin/tests/system/cds/setup.sh | 4 +++- bin/tests/system/pkcs11/setup.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/tests/system/cds/setup.sh b/bin/tests/system/cds/setup.sh index dcb0070a12..6e3197d577 100644 --- a/bin/tests/system/cds/setup.sh +++ b/bin/tests/system/cds/setup.sh @@ -11,11 +11,13 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. -set -eu +set -e SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +set -u + touch empty Z=cds.test diff --git a/bin/tests/system/pkcs11/setup.sh b/bin/tests/system/pkcs11/setup.sh index b592fd095c..274ccf6f2a 100644 --- a/bin/tests/system/pkcs11/setup.sh +++ b/bin/tests/system/pkcs11/setup.sh @@ -11,12 +11,14 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. -set -eu +set -e SYSTEMTESTTOP=.. # shellcheck source=conf.sh . "$SYSTEMTESTTOP/conf.sh" +set -u + echo_i "Generating keys for Native PKCS#11" >&2 infile=ns1/example.db.in