From: Thomas Huth <thuth@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>,
Gerd Hoffmann <kraxel@redhat.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PULL v2 00/15] Cirrus-CI improvements, and other CI-related fixes, m68k
Date: Thu, 3 Sep 2020 12:52:37 +0200 [thread overview]
Message-ID: <1439a577-b99a-c1c0-c05c-7a60907a88b3@redhat.com> (raw)
In-Reply-To: <CAFEAcA_Ur-ZwVg-Y=6zbeUMOisjrXVctcEMtQqsDfSANXn_h+A@mail.gmail.com>
On 03/09/2020 12.48, Peter Maydell wrote:
> On Thu, 3 Sep 2020 at 06:47, Gerd Hoffmann <kraxel@redhat.com> wrote:
>>
>> 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
>
> If this is for back-compat with old trees only we should add a
> comment that documents that in the final version of this patch.
Ok, I can try to respin my pull request with this patch and the
following comment added:
# UNLINK is used to remove symlinks from older development
# versions that might get into the way when doing "git update"
# without doing a "make distclean" in between.
Does that sound ok?
I wasn't able to reproduce the problem locally so far, so I hope it's ok
if I "abuse" your merge test for this, Peter?
Thomas
prev parent reply other threads:[~2020-09-03 10:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 15:49 [PULL v2 00/15] Cirrus-CI improvements, and other CI-related fixes, m68k Thomas Huth
2020-09-02 15:49 ` [PULL v2 01/15] configure: Fix atomic64 test for --enable-werror on macOS Thomas Huth
2020-09-02 15:49 ` [PULL v2 02/15] cirrus.yml: Compile FreeBSD with -Werror Thomas Huth
2020-09-02 15:49 ` [PULL v2 03/15] cirrus.yml: Compile macOS " Thomas Huth
2020-09-02 15:49 ` [PULL v2 04/15] cirrus.yml: Update the macOS jobs to Catalina Thomas Huth
2020-09-02 15:49 ` [PULL v2 05/15] cirrus.yml: Split FreeBSD job into two parts Thomas Huth
2020-09-02 15:49 ` [PULL v2 06/15] meson: fix keymaps without qemu-keymap Thomas Huth
2020-09-02 15:49 ` [PULL v2 07/15] configure: Add system = 'linux' for meson when cross-compiling Thomas Huth
2020-09-02 15:49 ` [PULL v2 08/15] hw/m68k: QOMify the mcf5206 system integration module Thomas Huth
2020-09-02 15:49 ` [PULL v2 09/15] tests/qtest/ahci: Improve error handling (NEGATIVE_RETURNS) Thomas Huth
2020-09-02 15:49 ` [PULL v2 10/15] tests/qtest/tpm: Declare input buffers const and static Thomas Huth
2020-09-02 15:49 ` [PULL v2 11/15] tests/qtest/ipmi-kcs: Fix assert side-effect Thomas Huth
2020-09-02 15:49 ` [PULL v2 12/15] libqtest: Rename qmp_assert_error_class() to qmp_expect_error_and_unref() Thomas Huth
2020-09-02 15:49 ` [PULL v2 13/15] gitlab/travis: Rework the disabled features tests Thomas Huth
2020-09-02 15:49 ` [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 15:49 ` [PULL v2 15/15] gitlab-ci.yml: Set artifacts expiration time Thomas Huth
2020-09-02 20:19 ` [PULL v2 00/15] Cirrus-CI improvements, and other CI-related fixes, m68k Peter Maydell
2020-09-03 5:11 ` Thomas Huth
2020-09-03 5:47 ` Gerd Hoffmann
2020-09-03 10:48 ` Peter Maydell
2020-09-03 10:52 ` Thomas Huth [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439a577-b99a-c1c0-c05c-7a60907a88b3@redhat.com \
--to=thuth@redhat.com \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).