From ef05facc5e2d693c35e89af37d9329a87bdd7187 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 29 Aug 2024 15:35:36 +0100 Subject: [PATCH] ci/deqp: Make build-deqp safe for set -u Signed-off-by: Daniel Stone Part-of: --- .gitlab-ci/container/build-deqp.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 70545a2c4a6..cff311cd7ae 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -8,7 +8,7 @@ # DEBIAN_TEST_VK_TAG # KERNEL_ROOTFS_TAG -set -ex -o pipefail +set -uex -o pipefail # See `deqp_build_targets` below for which release is used to produce which # binary. Unless this comment has bitrotten: @@ -144,7 +144,7 @@ if [ "${DEQP_API}" = 'GLES' ]; then cmake -S /VK-GL-CTS -B . -G Ninja \ -DDEQP_TARGET=android \ -DCMAKE_BUILD_TYPE=Release \ - $EXTRA_CMAKE_ARGS + ${EXTRA_CMAKE_ARGS:-} mold --run ninja modules/egl/deqp-egl mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android else @@ -153,14 +153,14 @@ if [ "${DEQP_API}" = 'GLES' ]; then cmake -S /VK-GL-CTS -B . -G Ninja \ -DDEQP_TARGET=x11_egl_glx \ -DCMAKE_BUILD_TYPE=Release \ - $EXTRA_CMAKE_ARGS + ${EXTRA_CMAKE_ARGS:-} mold --run ninja modules/egl/deqp-egl mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-x11 cmake -S /VK-GL-CTS -B . -G Ninja \ -DDEQP_TARGET=wayland \ -DCMAKE_BUILD_TYPE=Release \ - $EXTRA_CMAKE_ARGS + ${EXTRA_CMAKE_ARGS:-} mold --run ninja modules/egl/deqp-egl mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-wayland fi @@ -169,7 +169,7 @@ fi cmake -S /VK-GL-CTS -B . -G Ninja \ -DDEQP_TARGET=${DEQP_TARGET} \ -DCMAKE_BUILD_TYPE=Release \ - $EXTRA_CMAKE_ARGS + ${EXTRA_CMAKE_ARGS:-} # Make sure `default` doesn't silently stop detecting one of the platforms we care about if [ "${DEQP_TARGET}" = 'default' ]; then