1. Patchew
  2. QEMU
  3. [PATCH v2 0/5] Shorten the runtime of some gitlab-CI shared runner jobs
  4. View patch

[PATCH v2 4/5] .gitlab-ci.d/buildtest-template: Simplify the configure step

Thomas Huth posted 5 patches 3 years ago
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>
[PATCH v2 4/5] .gitlab-ci.d/buildtest-template: Simplify the configure step
Posted by Thomas Huth 3 years ago 
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.

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
Re: [PATCH v2 4/5] .gitlab-ci.d/buildtest-template: Simplify the configure step
Posted by David Woodhouse 2 years, 11 months ago 
On Tue, 2023-02-07 at 21:14 +0100, Thomas Huth wrote:
> 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.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: David Woodhouse <dwmw2@infradead.org>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.