[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 30/33] gitlab-ci.d/buildtest-template: Simplify the configure step
From: |
Thomas Huth |
Subject: |
[PULL 30/33] gitlab-ci.d/buildtest-template: Simplify the configure step |
Date: |
Mon, 27 Feb 2023 12:36:18 +0100 |
It's easier to use ${TARGETS:+--target-list="$TARGETS"} to add
a --target-list parameter depending on whether the TARGETS variable
is set or not.
Message-Id: <20230207201447.566661-5-thuth@redhat.com>
Reviewed-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.d/buildtest-template.yml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.d/buildtest-template.yml
b/.gitlab-ci.d/buildtest-template.yml
index 73ecfabb8d..4a922d9c33 100644
--- a/.gitlab-ci.d/buildtest-template.yml
+++ b/.gitlab-ci.d/buildtest-template.yml
@@ -11,12 +11,10 @@
fi
- mkdir build
- cd build
- - if test -n "$TARGETS";
- then
- ../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=git}
$CONFIGURE_ARGS --target-list="$TARGETS" ;
- else
- ../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=git}
$CONFIGURE_ARGS ;
- fi || { cat config.log meson-logs/meson-log.txt && exit 1; }
+ - ../configure --enable-werror --disable-docs
+ ${LD_JOBS:+--meson=git} ${TARGETS:+--target-list="$TARGETS"}
+ $CONFIGURE_ARGS ||
+ { cat config.log meson-logs/meson-log.txt && exit 1; }
- if test -n "$LD_JOBS";
then
../meson/meson.py configure . -Dbackend_max_links="$LD_JOBS" ;
--
2.31.1
- [PULL 32/33] gitlab-ci.d/base: Mark jobs as interruptible by default, (continued)
- [PULL 32/33] gitlab-ci.d/base: Mark jobs as interruptible by default, Thomas Huth, 2023/02/27
- [PULL 21/33] target/s390x: Use tcg_constant_* in translate_vx.c.inc, Thomas Huth, 2023/02/27
- [PULL 17/33] s390x/pv: Add support for asynchronous teardown for reboot, Thomas Huth, 2023/02/27
- [PULL 23/33] tests/tcg/s390x: Add sam.S, Thomas Huth, 2023/02/27
- [PULL 28/33] gitlab-ci.d/buildtest: Remove aarch64-softmmu from the build-system-ubuntu job, Thomas Huth, 2023/02/27
- [PULL 31/33] gitlab-ci.d: Build with --enable-fdt=system by default, Thomas Huth, 2023/02/27
- [PULL 27/33] Updated the FSF address to <https://www.gnu.org/licenses/>, Thomas Huth, 2023/02/27
- [PULL 18/33] target/s390x: Use tcg_constant_* in local contexts, Thomas Huth, 2023/02/27
- [PULL 25/33] qemu-keymap: Silence memory leak warning from Clang's sanitizer, Thomas Huth, 2023/02/27
- [PULL 26/33] meson: fix dependency on qemu-keymap, Thomas Huth, 2023/02/27
- [PULL 30/33] gitlab-ci.d/buildtest-template: Simplify the configure step,
Thomas Huth <=
- Re: [PULL 00/33] s390x and testing related patches, Peter Maydell, 2023/02/27