From 4dcb0c67d34d58d69ca978f719252ce53a9e5579 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 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/tests/system/cds/setup.sh b/bin/tests/system/cds/setup.sh index c3ec8a23fe..6de5de5acb 100644 --- a/bin/tests/system/cds/setup.sh +++ b/bin/tests/system/cds/setup.sh @@ -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