From c2e0fdadebd2f9bf06fd73b9e89dae03133d71f9 Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Tue, 8 Nov 2022 09:47:31 +0000
Subject: [PATCH 1/2] ci: set -u in cirrus.sh to treat unset variables as an
error
---
.cirrus.yml | 1 +
ci/cirrus.sh | 17 +++++++++++------
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index 299d37b6e6583..e03647cdb8f86 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,6 +1,7 @@
env:
### compiler options
HOST:
+ WRAPPER_CMD:
# Specific warnings can be disabled with -Wno-error=foo.
# -pedantic-errors is not equivalent to -Werror=pedantic and thus not implied by -Werror according to the GCC manual.
WERROR_CFLAGS: -Werror -pedantic-errors
diff --git a/ci/cirrus.sh b/ci/cirrus.sh
index fb5854a777e7c..80352c6ae486d 100755
--- a/ci/cirrus.sh
+++ b/ci/cirrus.sh
@@ -1,7 +1,6 @@
#!/bin/sh
-set -e
-set -x
+set -eux
export LC_ALL=C
@@ -11,14 +10,20 @@ print_environment() {
set +x
# There are many ways to print variable names and their content. This one
# does not rely on bash.
- for i in WERROR_CFLAGS MAKEFLAGS BUILD \
+ for var in WERROR_CFLAGS MAKEFLAGS BUILD \
ECMULTWINDOW ECMULTGENPRECISION ASM WIDEMUL WITH_VALGRIND EXTRAFLAGS \
EXPERIMENTAL ECDH RECOVERY SCHNORRSIG \
SECP256K1_TEST_ITERS BENCH SECP256K1_BENCH_ITERS CTIMETEST\
EXAMPLES \
- WRAPPER_CMD CC AR NM HOST
+ HOST WRAPPER_CMD \
+ CC AR NM
do
- eval 'printf "%s %s " "$i=\"${'"$i"'}\""'
+ eval "isset=\${$var+x}"
+ if [ -n "$isset" ]; then
+ eval "val=\${$var}"
+ # shellcheck disable=SC2154
+ printf '%s="%s" ' "$var" "$val"
+ fi
done
echo "$0"
set -x
@@ -36,7 +41,7 @@ esac
env >> test_env.log
-if [ -n "$CC" ]; then
+if [ -n "${CC+x}" ]; then
# The MSVC compiler "cl" doesn't understand "-v"
$CC -v || true
fi
From 7a74688201318cbbe30b0d1601aae16dc14ee17a Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Thu, 17 Nov 2022 16:36:14 +0000
Subject: [PATCH 2/2] ci: add missing CFLAGS & CPPFLAGS variable to
print_environment
---
ci/cirrus.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci/cirrus.sh b/ci/cirrus.sh
index 80352c6ae486d..80ce8f27f2b28 100755
--- a/ci/cirrus.sh
+++ b/ci/cirrus.sh
@@ -16,7 +16,7 @@ print_environment() {
SECP256K1_TEST_ITERS BENCH SECP256K1_BENCH_ITERS CTIMETEST\
EXAMPLES \
HOST WRAPPER_CMD \
- CC AR NM
+ CC CFLAGS CPPFLAGS AR NM
do
eval "isset=\${$var+x}"
if [ -n "$isset" ]; then