| Message ID | 20201016100031.1557275-1-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | ci: include configure and meson logs in all jobs if configure fails | expand |
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 > > > <div dir="auto"><div><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Le ven. 16 oct. 2020 12:05, Paolo Bonzini <<a href="mailto:pbonzini@redhat.com">pbonzini@redhat.com</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Paolo Bonzini <<a href="mailto:pbonzini@redhat.com" target="_blank" rel="noreferrer">pbonzini@redhat.com</a>><br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Reviewed-by: Philippe Mathieu-Daudé <<a href="mailto:f4bug@amsat.org">f4bug@amsat.org</a>><br></div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> ---<br> .cirrus.yml | 6 +++---<br> .gitlab-ci.yml | 6 +++---<br> .travis.yml | 8 ++++----<br> 3 files changed, 10 insertions(+), 10 deletions(-)<br> <br> diff --git a/.cirrus.yml b/.cirrus.yml<br> index e099da0fec..81a2960b1a 100644<br> --- a/.cirrus.yml<br> +++ b/.cirrus.yml<br> @@ -13,7 +13,7 @@ freebsd_12_task:<br> script:<br> - mkdir build<br> - cd build<br> - - ../configure --enable-werror || { cat config.log; exit 1; }<br> + - ../configure --enable-werror || { cat config.log meson-logs/meson-log.txt; exit 1; }<br> - gmake -j$(sysctl -n hw.ncpu)<br> - gmake -j$(sysctl -n hw.ncpu) check V=1<br> <br> @@ -27,7 +27,7 @@ macos_task:<br> - cd build<br> - ../configure --python=/usr/local/bin/python3 --enable-werror<br> --extra-cflags='-Wno-error=deprecated-declarations'<br> - || { cat config.log; exit 1; }<br> + || { cat config.log meson-logs/meson-log.txt; exit 1; }<br> - gmake -j$(sysctl -n hw.ncpu)<br> - gmake check V=1<br> <br> @@ -41,7 +41,7 @@ macos_xcode_task:<br> - mkdir build<br> - cd build<br> - ../configure --extra-cflags='-Wno-error=deprecated-declarations'<br> - --enable-werror --cc=clang || { cat config.log; exit 1; }<br> + --enable-werror --cc=clang || { cat config.log meson-logs/meson-log.txt; exit 1; }<br> - gmake -j$(sysctl -n hw.ncpu)<br> - gmake check V=1<br> <br> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml<br> index 8ffd415ca5..66ad7aa5c2 100644<br> --- a/.gitlab-ci.yml<br> +++ b/.gitlab-ci.yml<br> @@ -32,7 +32,7 @@ include:<br> ../configure --enable-werror $CONFIGURE_ARGS --target-list="$TARGETS" ;<br> else<br> ../configure --enable-werror $CONFIGURE_ARGS ;<br> - fi<br> + fi || { cat config.log meson-logs/meson-log.txt && exit 1; }<br> - make -j"$JOBS"<br> - if test -n "$MAKE_CHECK_ARGS";<br> then<br> @@ -229,7 +229,7 @@ build-tcg-disabled:<br> script:<br> - mkdir build<br> - cd build<br> - - ../configure --disable-tcg --audio-drv-list=""<br> + - ../configure --disable-tcg --audio-drv-list="" || { cat config.log meson-logs/meson-log.txt && exit 1; }<br> - make -j"$JOBS"<br> - make check-unit<br> - make check-qapi-schema<br> @@ -322,7 +322,7 @@ build-tci:<br> - mkdir build<br> - cd build<br> - ../configure --enable-tcg-interpreter<br> - --target-list="$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '; done)"<br> + --target-list="$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '; done)" || { cat config.log meson-logs/meson-log.txt && exit 1; }<br> - make -j"$JOBS"<br> - make run-tcg-tests-x86_64-softmmu<br> - make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest/pxe-test<br> diff --git a/.travis.yml b/.travis.yml<br> index d7bfbb8bfe..a3d78171ca 100644<br> --- a/.travis.yml<br> +++ b/.travis.yml<br> @@ -95,7 +95,7 @@ before_install:<br> # Configure step - may be overridden<br> before_script:<br> - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}<br> - - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }<br> + - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log meson-logs/meson-log.txt && exit 1; }<br> <br> # Main build & test - rarely overridden - controlled by TEST_CMD<br> script:<br> @@ -199,7 +199,7 @@ jobs:<br> compiler: clang<br> before_script:<br> - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}<br> - - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-fsanitize=undefined -Werror" || { cat config.log && exit 1; }<br> + - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-fsanitize=undefined -Werror" || { cat config.log meson-logs/meson-log.txt && exit 1; }<br> <br> <br> - name: "Clang (other-softmmu)"<br> @@ -298,7 +298,7 @@ jobs:<br> - TEST_CMD=""<br> before_script:<br> - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}<br> - - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread" || { cat config.log && exit 1; }<br> + - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread" || { cat config.log meson-logs/meson-log.txt && exit 1; }<br> <br> <br> # Run check-tcg against linux-user<br> @@ -530,7 +530,7 @@ jobs:<br> - ls -l ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2<br> - tar -xf ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2 && cd qemu-${QEMU_VERSION}<br> - mkdir -p release-build && cd release-build<br> - - ../configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }<br> + - ../configure ${BASE_CONFIG} ${CONFIG} || { cat config.log meson-logs/meson-log.txt && exit 1; }<br> - make install<br> allow_failures:<br> - env: UNRELIABLE=true<br> -- <br> 2.26.2<br> <br> <br> </blockquote></div></div></div>
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
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(-)