| Message ID | 20200902154932.390595-1-thuth@redhat.com |
|---|---|
| Headers | show |
| Series | Cirrus-CI improvements, and other CI-related fixes, m68k | expand |
Hi, > Darn. I've added Gerd's patch since it is needed to fix the acceptance > tests in the Gitlab-CI. Could we maybe revert the patch that introduced > the regression instead, as long as no other proper fix is available? The > failing CI is really bugging me. Well, ddcf607fa3d6 fixes another nasty issue (builds modifying the source tree), so reverting that isn't really an option. We could have configure remove the symlink in case is present. That way old build trees with the symlink already created should work too. Right now only build trees created with ddcf607fa3d6 present are working properly. Untested patch below. take care, Gerd diff --git a/configure b/configure index b1e11397a827..493b4e86da62 100755 --- a/configure +++ b/configure @@ -8107,6 +8107,7 @@ LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit LINKS="$LINKS tests/acceptance tests/data" LINKS="$LINKS tests/qemu-iotests/check" LINKS="$LINKS python" +UNLINK="pc-bios/keymaps" for bios_file in \ $source_path/pc-bios/*.bin \ $source_path/pc-bios/*.elf \ @@ -8127,6 +8128,11 @@ for f in $LINKS ; do symlink "$source_path/$f" "$f" fi done +for f in $UNLINK ; do + if [ -L "$f" ]; then + rm -f "$f" + fi +done (for i in $cross_cc_vars; do export $i
Hi Peter, the following changes since commit 887adde81d1f1f3897f1688d37ec6851b4fdad86: Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging (2020-09-01 22:50:23 +0100) are available in the Git repository at: https://gitlab.com/huth/qemu.git tags/pull-request-2020-09-02 for you to fetch changes up to 5e560e07ca396e16150740ae3c46b35a85f59ba7: gitlab-ci.yml: Set artifacts expiration time (2020-09-02 16:23:55 +0200) ---------------------------------------------------------------- * Cirrus-CI improvements and fixes (compile with -Werror & fix for 1h problem) * Two build system fixes to fix some failures the CI * One m68k QOMification patch * Some trivial qtest patches * Some small improvements for the Gitlab CI ---------------------------------------------------------------- Gerd Hoffmann (1): meson: fix keymaps without qemu-keymap Markus Armbruster (1): libqtest: Rename qmp_assert_error_class() to qmp_expect_error_and_unref() Philippe Mathieu-Daudé (3): tests/qtest/ahci: Improve error handling (NEGATIVE_RETURNS) tests/qtest/tpm: Declare input buffers const and static tests/qtest/ipmi-kcs: Fix assert side-effect Thomas Huth (10): configure: Fix atomic64 test for --enable-werror on macOS cirrus.yml: Compile FreeBSD with -Werror cirrus.yml: Compile macOS with -Werror cirrus.yml: Update the macOS jobs to Catalina cirrus.yml: Split FreeBSD job into two parts configure: Add system = 'linux' for meson when cross-compiling hw/m68k: QOMify the mcf5206 system integration module gitlab/travis: Rework the disabled features tests gitlab-ci.yml: Run check-qtest and check-unit at the end of the fuzzer job gitlab-ci.yml: Set artifacts expiration time .cirrus.yml | 43 ++++++++++++++++++++++++++++++++---------- .gitlab-ci.yml | 36 ++++++++++++++++++++++++++--------- .travis.yml | 6 ------ configure | 13 ++++++++----- hw/m68k/an5206.c | 14 ++++++++++++-- hw/m68k/mcf5206.c | 44 ++++++++++++++++++++++++++++++++++--------- include/hw/m68k/mcf.h | 3 +-- pc-bios/keymaps/meson.build | 28 ++++++++++++++++++--------- tests/qtest/ahci-test.c | 1 + tests/qtest/drive_del-test.c | 2 +- tests/qtest/ipmi-kcs-test.c | 3 ++- tests/qtest/libqos/libqtest.h | 4 ++-- tests/qtest/libqtest.c | 2 +- tests/qtest/qmp-cmd-test.c | 16 ++++++++-------- tests/qtest/qmp-test.c | 32 +++++++++++++++---------------- tests/qtest/tpm-tests.c | 4 ++-- tests/qtest/tpm-util.c | 10 +++++----- tests/test-qga.c | 2 +- 18 files changed, 174 insertions(+), 89 deletions(-)