[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] gitlab: show configure/make args before running
From: |
Daniel P . Berrangé |
Subject: |
[PATCH 2/2] gitlab: show configure/make args before running |
Date: |
Thu, 3 Nov 2022 13:30:44 -0400 |
When debugging failed jobs it is helpful to see the
full configure/make args used, without having to search
the gitlab config file to figure it out.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
.gitlab-ci.d/buildtest-template.yml | 4 ++++
.gitlab-ci.d/crossbuild-template.yml | 15 +++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/.gitlab-ci.d/buildtest-template.yml
b/.gitlab-ci.d/buildtest-template.yml
index 73ecfabb8d..0af980c71d 100644
--- a/.gitlab-ci.d/buildtest-template.yml
+++ b/.gitlab-ci.d/buildtest-template.yml
@@ -13,8 +13,10 @@
- cd build
- if test -n "$TARGETS";
then
+ echo "../configure --enable-werror --disable-docs
${LD_JOBS:+--meson=git} $CONFIGURE_ARGS --target-list=\"$TARGETS\"" ;
../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=git}
$CONFIGURE_ARGS --target-list="$TARGETS" ;
else
+ echo "../configure --enable-werror --disable-docs
${LD_JOBS:+--meson=git} $CONFIGURE_ARGS" ;
../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=git}
$CONFIGURE_ARGS ;
fi || { cat config.log meson-logs/meson-log.txt && exit 1; }
- if test -n "$LD_JOBS";
@@ -24,6 +26,7 @@
- make -j"$JOBS"
- if test -n "$MAKE_CHECK_ARGS";
then
+ echo "make -j\"$JOBS\" $MAKE_CHECK_ARGS" ;
make -j"$JOBS" $MAKE_CHECK_ARGS ;
fi
@@ -37,6 +40,7 @@
- cd build
- find . -type f -exec touch {} +
# Avoid recompiling by hiding ninja with NINJA=":"
+ - echo "make NINJA=\":\" $MAKE_CHECK_ARGS"
- make NINJA=":" $MAKE_CHECK_ARGS
.native_test_job_template:
diff --git a/.gitlab-ci.d/crossbuild-template.yml
b/.gitlab-ci.d/crossbuild-template.yml
index 6d709628f1..d217dcaae0 100644
--- a/.gitlab-ci.d/crossbuild-template.yml
+++ b/.gitlab-ci.d/crossbuild-template.yml
@@ -6,11 +6,17 @@
script:
- mkdir build
- cd build
+ - echo "../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
+ --disable-user --target-list-exclude=\"arm-softmmu cris-softmmu
+ i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
+ mips64-softmmu ppc-softmmu riscv32-softmmu sh4-softmmu
+ sparc-softmmu xtensa-softmmu $CROSS_SKIP_TARGETS\""
- ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
--disable-user --target-list-exclude="arm-softmmu cris-softmmu
i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
mips64-softmmu ppc-softmmu riscv32-softmmu sh4-softmmu
sparc-softmmu xtensa-softmmu $CROSS_SKIP_TARGETS"
+ - echo "make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS"
- make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
- if grep -q "EXESUF=.exe" config-host.mak;
then make installer;
@@ -31,8 +37,11 @@
script:
- mkdir build
- cd build
+ - echo "../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
+ --disable-tools --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS"
- ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
--disable-tools --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS
+ - echo "make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS"
- make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
.cross_user_build_job:
@@ -42,9 +51,15 @@
script:
- mkdir build
- cd build
+ - echo "../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
+ --disable-system --target-list-exclude=\"aarch64_be-linux-user
+ alpha-linux-user cris-linux-user m68k-linux-user
microblazeel-linux-user
+ nios2-linux-user or1k-linux-user ppc-linux-user sparc-linux-user
+ xtensa-linux-user $CROSS_SKIP_TARGETS\""
- ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
--disable-system --target-list-exclude="aarch64_be-linux-user
alpha-linux-user cris-linux-user m68k-linux-user
microblazeel-linux-user
nios2-linux-user or1k-linux-user ppc-linux-user sparc-linux-user
xtensa-linux-user $CROSS_SKIP_TARGETS"
+ - echo "make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS"
- make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
--
2.37.2