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)

diff --git a/bin/tests/system/cds/setup.sh b/bin/tests/system/cds/setup.sh
index dcb0070a1224f009252132dbe92303ced2203f9c..6e3197d577a6cd9aa2171928268664836cdae921 100644 (file)
--- 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 b592fd095cac5599ea2ac3a7450c5f65f1b43a6b..274ccf6f2a6118c0fb61276cded9eb471b147683 100644 (file)
--- 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