[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PULL v2 00/15] Cirrus-CI improvements, and other CI-related fixes,
From: |
Gerd Hoffmann |
Subject: |
Re: [PULL v2 00/15] Cirrus-CI improvements, and other CI-related fixes, m68k |
Date: |
Thu, 3 Sep 2020 07:47:11 +0200 |
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
- [PULL v2 10/15] tests/qtest/tpm: Declare input buffers const and static, (continued)
- [PULL v2 10/15] tests/qtest/tpm: Declare input buffers const and static, Thomas Huth, 2020/09/02
- [PULL v2 07/15] configure: Add system = 'linux' for meson when cross-compiling, Thomas Huth, 2020/09/02
- [PULL v2 06/15] meson: fix keymaps without qemu-keymap, Thomas Huth, 2020/09/02
- [PULL v2 11/15] tests/qtest/ipmi-kcs: Fix assert side-effect, Thomas Huth, 2020/09/02
- [PULL v2 12/15] libqtest: Rename qmp_assert_error_class() to qmp_expect_error_and_unref(), Thomas Huth, 2020/09/02
- [PULL v2 13/15] gitlab/travis: Rework the disabled features tests, Thomas Huth, 2020/09/02
- [PULL v2 14/15] gitlab-ci.yml: Run check-qtest and check-unit at the end of the fuzzer job, Thomas Huth, 2020/09/02
- [PULL v2 15/15] gitlab-ci.yml: Set artifacts expiration time, Thomas Huth, 2020/09/02
- Re: [PULL v2 00/15] Cirrus-CI improvements, and other CI-related fixes, m68k, Peter Maydell, 2020/09/02
- Re: [PULL v2 00/15] Cirrus-CI improvements, and other CI-related fixes, m68k, Thomas Huth, 2020/09/03
- Re: [PULL v2 00/15] Cirrus-CI improvements, and other CI-related fixes, m68k,
Gerd Hoffmann <=
- Re: [PULL v2 00/15] Cirrus-CI improvements, and other CI-related fixes, m68k, Peter Maydell, 2020/09/03
- Re: [PULL v2 00/15] Cirrus-CI improvements, and other CI-related fixes, m68k, Thomas Huth, 2020/09/03