* [PATCH] ci: include configure and meson logs in all jobs if configure fails
@ 2020-10-16 10:00 Paolo Bonzini
2020-10-16 10:24 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 2+ messages in thread
From: Paolo Bonzini @ 2020-10-16 10:00 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.cirrus.yml | 6 +++---
.gitlab-ci.yml | 6 +++---
.travis.yml | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index e099da0fec..81a2960b1a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -13,7 +13,7 @@ freebsd_12_task:
script:
- mkdir build
- cd build
- - ../configure --enable-werror || { cat config.log; exit 1; }
+ - ../configure --enable-werror || { cat config.log meson-logs/meson-log.txt; exit 1; }
- gmake -j$(sysctl -n hw.ncpu)
- gmake -j$(sysctl -n hw.ncpu) check V=1
@@ -27,7 +27,7 @@ macos_task:
- cd build
- ../configure --python=/usr/local/bin/python3 --enable-werror
--extra-cflags='-Wno-error=deprecated-declarations'
- || { cat config.log; exit 1; }
+ || { cat config.log meson-logs/meson-log.txt; exit 1; }
- gmake -j$(sysctl -n hw.ncpu)
- gmake check V=1
@@ -41,7 +41,7 @@ macos_xcode_task:
- mkdir build
- cd build
- ../configure --extra-cflags='-Wno-error=deprecated-declarations'
- --enable-werror --cc=clang || { cat config.log; exit 1; }
+ --enable-werror --cc=clang || { cat config.log meson-logs/meson-log.txt; exit 1; }
- gmake -j$(sysctl -n hw.ncpu)
- gmake check V=1
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ffd415ca5..66ad7aa5c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ include:
../configure --enable-werror $CONFIGURE_ARGS --target-list="$TARGETS" ;
else
../configure --enable-werror $CONFIGURE_ARGS ;
- fi
+ fi || { cat config.log meson-logs/meson-log.txt && exit 1; }
- make -j"$JOBS"
- if test -n "$MAKE_CHECK_ARGS";
then
@@ -229,7 +229,7 @@ build-tcg-disabled:
script:
- mkdir build
- cd build
- - ../configure --disable-tcg --audio-drv-list=""
+ - ../configure --disable-tcg --audio-drv-list="" || { cat config.log meson-logs/meson-log.txt && exit 1; }
- make -j"$JOBS"
- make check-unit
- make check-qapi-schema
@@ -322,7 +322,7 @@ build-tci:
- mkdir build
- cd build
- ../configure --enable-tcg-interpreter
- --target-list="$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '; done)"
+ --target-list="$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '; done)" || { cat config.log meson-logs/meson-log.txt && exit 1; }
- make -j"$JOBS"
- make run-tcg-tests-x86_64-softmmu
- make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest/pxe-test
diff --git a/.travis.yml b/.travis.yml
index d7bfbb8bfe..a3d78171ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,7 +95,7 @@ before_install:
# Configure step - may be overridden
before_script:
- mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
- - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
+ - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log meson-logs/meson-log.txt && exit 1; }
# Main build & test - rarely overridden - controlled by TEST_CMD
script:
@@ -199,7 +199,7 @@ jobs:
compiler: clang
before_script:
- mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
- - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-fsanitize=undefined -Werror" || { cat config.log && exit 1; }
+ - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-fsanitize=undefined -Werror" || { cat config.log meson-logs/meson-log.txt && exit 1; }
- name: "Clang (other-softmmu)"
@@ -298,7 +298,7 @@ jobs:
- TEST_CMD=""
before_script:
- mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
- - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread" || { cat config.log && exit 1; }
+ - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread" || { cat config.log meson-logs/meson-log.txt && exit 1; }
# Run check-tcg against linux-user
@@ -530,7 +530,7 @@ jobs:
- ls -l ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2
- tar -xf ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2 && cd qemu-${QEMU_VERSION}
- mkdir -p release-build && cd release-build
- - ../configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
+ - ../configure ${BASE_CONFIG} ${CONFIG} || { cat config.log meson-logs/meson-log.txt && exit 1; }
- make install
allow_failures:
- env: UNRELIABLE=true
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ci: include configure and meson logs in all jobs if configure fails
2020-10-16 10:00 [PATCH] ci: include configure and meson logs in all jobs if configure fails Paolo Bonzini
@ 2020-10-16 10:24 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-10-16 10:24 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel@nongnu.org Developers
[-- Attachment #1: Type: text/plain, Size: 5030 bytes --]
Le ven. 16 oct. 2020 12:05, Paolo Bonzini <pbonzini@redhat.com> a écrit :
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
> .cirrus.yml | 6 +++---
> .gitlab-ci.yml | 6 +++---
> .travis.yml | 8 ++++----
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index e099da0fec..81a2960b1a 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -13,7 +13,7 @@ freebsd_12_task:
> script:
> - mkdir build
> - cd build
> - - ../configure --enable-werror || { cat config.log; exit 1; }
> + - ../configure --enable-werror || { cat config.log
> meson-logs/meson-log.txt; exit 1; }
> - gmake -j$(sysctl -n hw.ncpu)
> - gmake -j$(sysctl -n hw.ncpu) check V=1
>
> @@ -27,7 +27,7 @@ macos_task:
> - cd build
> - ../configure --python=/usr/local/bin/python3 --enable-werror
> --extra-cflags='-Wno-error=deprecated-declarations'
> - || { cat config.log; exit 1; }
> + || { cat config.log meson-logs/meson-log.txt; exit 1; }
> - gmake -j$(sysctl -n hw.ncpu)
> - gmake check V=1
>
> @@ -41,7 +41,7 @@ macos_xcode_task:
> - mkdir build
> - cd build
> - ../configure --extra-cflags='-Wno-error=deprecated-declarations'
> - --enable-werror --cc=clang || { cat config.log; exit
> 1; }
> + --enable-werror --cc=clang || { cat config.log
> meson-logs/meson-log.txt; exit 1; }
> - gmake -j$(sysctl -n hw.ncpu)
> - gmake check V=1
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 8ffd415ca5..66ad7aa5c2 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -32,7 +32,7 @@ include:
> ../configure --enable-werror $CONFIGURE_ARGS
> --target-list="$TARGETS" ;
> else
> ../configure --enable-werror $CONFIGURE_ARGS ;
> - fi
> + fi || { cat config.log meson-logs/meson-log.txt && exit 1; }
> - make -j"$JOBS"
> - if test -n "$MAKE_CHECK_ARGS";
> then
> @@ -229,7 +229,7 @@ build-tcg-disabled:
> script:
> - mkdir build
> - cd build
> - - ../configure --disable-tcg --audio-drv-list=""
> + - ../configure --disable-tcg --audio-drv-list="" || { cat config.log
> meson-logs/meson-log.txt && exit 1; }
> - make -j"$JOBS"
> - make check-unit
> - make check-qapi-schema
> @@ -322,7 +322,7 @@ build-tci:
> - mkdir build
> - cd build
> - ../configure --enable-tcg-interpreter
> - --target-list="$(for tg in $TARGETS; do echo -n ${tg}'-softmmu ';
> done)"
> + --target-list="$(for tg in $TARGETS; do echo -n ${tg}'-softmmu ';
> done)" || { cat config.log meson-logs/meson-log.txt && exit 1; }
> - make -j"$JOBS"
> - make run-tcg-tests-x86_64-softmmu
> - make tests/qtest/boot-serial-test tests/qtest/cdrom-test
> tests/qtest/pxe-test
> diff --git a/.travis.yml b/.travis.yml
> index d7bfbb8bfe..a3d78171ca 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -95,7 +95,7 @@ before_install:
> # Configure step - may be overridden
> before_script:
> - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
> - - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log &&
> exit 1; }
> + - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log
> meson-logs/meson-log.txt && exit 1; }
>
> # Main build & test - rarely overridden - controlled by TEST_CMD
> script:
> @@ -199,7 +199,7 @@ jobs:
> compiler: clang
> before_script:
> - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
> - - ${SRC_DIR}/configure ${CONFIG}
> --extra-cflags="-fsanitize=undefined -Werror" || { cat config.log && exit
> 1; }
> + - ${SRC_DIR}/configure ${CONFIG}
> --extra-cflags="-fsanitize=undefined -Werror" || { cat config.log
> meson-logs/meson-log.txt && exit 1; }
>
>
> - name: "Clang (other-softmmu)"
> @@ -298,7 +298,7 @@ jobs:
> - TEST_CMD=""
> before_script:
> - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
> - - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0
> -fsanitize=thread" || { cat config.log && exit 1; }
> + - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0
> -fsanitize=thread" || { cat config.log meson-logs/meson-log.txt && exit 1; }
>
>
> # Run check-tcg against linux-user
> @@ -530,7 +530,7 @@ jobs:
> - ls -l ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2
> - tar -xf ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2 && cd
> qemu-${QEMU_VERSION}
> - mkdir -p release-build && cd release-build
> - - ../configure ${BASE_CONFIG} ${CONFIG} || { cat config.log &&
> exit 1; }
> + - ../configure ${BASE_CONFIG} ${CONFIG} || { cat config.log
> meson-logs/meson-log.txt && exit 1; }
> - make install
> allow_failures:
> - env: UNRELIABLE=true
> --
> 2.26.2
>
>
>
[-- Attachment #2: Type: text/html, Size: 6423 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-16 10:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-16 10:00 [PATCH] ci: include configure and meson logs in all jobs if configure fails Paolo Bonzini
2020-10-16 10:24 ` Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.