mbox series

[PULL,00/12] testing and plugin fixes

Message ID 20200527145455.2550-1-alex.bennee@linaro.org
Headers show
Series testing and plugin fixes | expand

Message

Alex Bennée May 27, 2020, 2:54 p.m. UTC
The following changes since commit ddc760832fa8cf5e93b9d9e6e854a5114ac63510:

  Merge remote-tracking branch 'remotes/gkurz/tags/9p-next-2020-05-26' into staging (2020-05-26 14:05:53 +0100)

are available in the Git repository at:

  https://github.com/stsquad/qemu.git tags/pull-testing-tcg-plugins-270520-1

for you to fetch changes up to 919bfbf5d6569b63a374332292cf3d2355a6d6c3:

  tests/tcg: add new threadcount test (2020-05-27 14:26:49 +0100)

----------------------------------------------------------------
Testing and one plugin fix:

  - support alternates for genisoimage to test/vm
  - add clang++ to clang tests
  - fix record/replay smoke test
  - enable more softfloat tests
  - better detection of hung gdb
  - upgrade aarch64 tcg test x-compile to gcc-10
  - fix plugin cpu_index clash vs threads

----------------------------------------------------------------
Alex Bennée (11):
      configure: add alternate binary for genisoimage
      tests/vm: pass --genisoimage to basevm script
      tests/tcg: fix invocation of the memory record/replay tests
      tests/fp: enable extf80_le_quite tests
      tests/fp: split and audit the conversion tests
      tests/tcg: better detect confused gdb which can't connect
      tests/docker: add debian11 base image
      tests/docker: use a gcc-10 based image for arm64 tests
      cpus-common: ensure auto-assigned cpu_indexes don't clash
      linux-user: properly "unrealize" vCPU object
      tests/tcg: add new threadcount test

Thomas Huth (1):
      travis.yml: Use clang++ in the Clang tests

 configure                                          |  2 +-
 cpus-common.c                                      | 10 ++--
 linux-user/syscall.c                               | 19 ++++---
 tests/tcg/multiarch/threadcount.c                  | 64 ++++++++++++++++++++++
 .travis.yml                                        |  8 ++-
 tests/Makefile.include                             | 44 +++++++++++----
 tests/docker/Makefile.include                      |  4 +-
 .../dockerfiles/debian-arm64-test-cross.docker     | 13 +++++
 tests/docker/dockerfiles/debian11.docker           | 18 ++++++
 tests/tcg/aarch64/Makefile.softmmu-target          |  2 +-
 tests/tcg/configure.sh                             |  4 +-
 tests/tcg/multiarch/Makefile.target                |  2 +
 tests/tcg/multiarch/gdbstub/sha1.py                |  4 ++
 tests/vm/Makefile.include                          |  1 +
 tests/vm/basevm.py                                 | 16 ++++--
 15 files changed, 172 insertions(+), 39 deletions(-)
 create mode 100644 tests/tcg/multiarch/threadcount.c
 create mode 100644 tests/docker/dockerfiles/debian-arm64-test-cross.docker
 create mode 100644 tests/docker/dockerfiles/debian11.docker

-- 
2.20.1

Comments

Peter Maydell May 28, 2020, 1:54 p.m. UTC | #1
On Wed, 27 May 2020 at 15:54, Alex Bennée <alex.bennee@linaro.org> wrote:
>

> The following changes since commit ddc760832fa8cf5e93b9d9e6e854a5114ac63510:

>

>   Merge remote-tracking branch 'remotes/gkurz/tags/9p-next-2020-05-26' into staging (2020-05-26 14:05:53 +0100)

>

> are available in the Git repository at:

>

>   https://github.com/stsquad/qemu.git tags/pull-testing-tcg-plugins-270520-1

>

> for you to fetch changes up to 919bfbf5d6569b63a374332292cf3d2355a6d6c3:

>

>   tests/tcg: add new threadcount test (2020-05-27 14:26:49 +0100)

>

> ----------------------------------------------------------------

> Testing and one plugin fix:

>

>   - support alternates for genisoimage to test/vm

>   - add clang++ to clang tests

>   - fix record/replay smoke test

>   - enable more softfloat tests

>   - better detection of hung gdb

>   - upgrade aarch64 tcg test x-compile to gcc-10

>   - fix plugin cpu_index clash vs threads


This makes the NetBSD tests/vm setup spit out a huge pile of extra warnings:
every link has something like:

ld: warning: libintl.so.1, needed by /usr/pkg/lib/libglib-2.0.so, may
conflict with libintl.so.8

or some variant like:
ld: warning: libintl.so.1, needed by /usr/pkg/lib/libcurl.so, may
conflict with libintl.so.8
ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may
conflict with libintl.so.8

thanks
-- PMM
Alex Bennée May 28, 2020, 2:16 p.m. UTC | #2
Peter Maydell <peter.maydell@linaro.org> writes:

> On Wed, 27 May 2020 at 15:54, Alex Bennée <alex.bennee@linaro.org> wrote:

>>

>> The following changes since commit ddc760832fa8cf5e93b9d9e6e854a5114ac63510:

>>

>>   Merge remote-tracking branch 'remotes/gkurz/tags/9p-next-2020-05-26' into staging (2020-05-26 14:05:53 +0100)

>>

>> are available in the Git repository at:

>>

>>   https://github.com/stsquad/qemu.git tags/pull-testing-tcg-plugins-270520-1

>>

>> for you to fetch changes up to 919bfbf5d6569b63a374332292cf3d2355a6d6c3:

>>

>>   tests/tcg: add new threadcount test (2020-05-27 14:26:49 +0100)

>>

>> ----------------------------------------------------------------

>> Testing and one plugin fix:

>>

>>   - support alternates for genisoimage to test/vm

>>   - add clang++ to clang tests

>>   - fix record/replay smoke test

>>   - enable more softfloat tests

>>   - better detection of hung gdb

>>   - upgrade aarch64 tcg test x-compile to gcc-10

>>   - fix plugin cpu_index clash vs threads

>

> This makes the NetBSD tests/vm setup spit out a huge pile of extra warnings:

> every link has something like:

>

> ld: warning: libintl.so.1, needed by /usr/pkg/lib/libglib-2.0.so, may

> conflict with libintl.so.8

>

> or some variant like:

> ld: warning: libintl.so.1, needed by /usr/pkg/lib/libcurl.so, may

> conflict with libintl.so.8

> ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may

> conflict with libintl.so.8


Weird... I'll have a look at whats going on.

>

> thanks

> -- PMM



-- 
Alex Bennée
Alex Bennée May 28, 2020, 2:57 p.m. UTC | #3
Peter Maydell <peter.maydell@linaro.org> writes:

> On Wed, 27 May 2020 at 15:54, Alex Bennée <alex.bennee@linaro.org> wrote:

>>

>> The following changes since commit ddc760832fa8cf5e93b9d9e6e854a5114ac63510:

>>

>>   Merge remote-tracking branch 'remotes/gkurz/tags/9p-next-2020-05-26' into staging (2020-05-26 14:05:53 +0100)

>>

>> are available in the Git repository at:

>>

>>   https://github.com/stsquad/qemu.git tags/pull-testing-tcg-plugins-270520-1

>>

>> for you to fetch changes up to 919bfbf5d6569b63a374332292cf3d2355a6d6c3:

>>

>>   tests/tcg: add new threadcount test (2020-05-27 14:26:49 +0100)

>>

>> ----------------------------------------------------------------

>> Testing and one plugin fix:

>>

>>   - support alternates for genisoimage to test/vm

>>   - add clang++ to clang tests

>>   - fix record/replay smoke test

>>   - enable more softfloat tests

>>   - better detection of hung gdb

>>   - upgrade aarch64 tcg test x-compile to gcc-10

>>   - fix plugin cpu_index clash vs threads

>

> This makes the NetBSD tests/vm setup spit out a huge pile of extra warnings:

> every link has something like:

>

> ld: warning: libintl.so.1, needed by /usr/pkg/lib/libglib-2.0.so, may

> conflict with libintl.so.8

>

> or some variant like:

> ld: warning: libintl.so.1, needed by /usr/pkg/lib/libcurl.so, may

> conflict with libintl.so.8

> ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may

> conflict with libintl.so.8


I get these on commit ddc760832fa8cf5e93b9d9e6e854a5114ac63510:

    LINK    arm-softmmu/qemu-system-arm
  ld: /usr/lib/libc.so and /usr/lib/crt0.o: warning: multiple common of `environ'
  ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8
  ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8
  ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8
  ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8
  ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

which makes me think the build environment has changed and it was simply
that my PR triggered a re-build of the NetBSD VM.

-- 
Alex Bennée
Peter Maydell May 28, 2020, 3:09 p.m. UTC | #4
On Thu, 28 May 2020 at 15:57, Alex Bennée <alex.bennee@linaro.org> wrote:
> I get these on commit ddc760832fa8cf5e93b9d9e6e854a5114ac63510:

>

>     LINK    arm-softmmu/qemu-system-arm

>   ld: /usr/lib/libc.so and /usr/lib/crt0.o: warning: multiple common of `environ'

>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

>

> which makes me think the build environment has changed and it was simply

> that my PR triggered a re-build of the NetBSD VM.


Yes. I see them also now on the next pullreq I'm trying to
process. How do I get back to an environment that doesn't
produce all these warnings?

thanks
-- PMM
Philippe Mathieu-Daudé May 28, 2020, 3:18 p.m. UTC | #5
+Gerd

On 5/28/20 5:09 PM, Peter Maydell wrote:
> On Thu, 28 May 2020 at 15:57, Alex Bennée <alex.bennee@linaro.org> wrote:

>> I get these on commit ddc760832fa8cf5e93b9d9e6e854a5114ac63510:

>>

>>     LINK    arm-softmmu/qemu-system-arm

>>   ld: /usr/lib/libc.so and /usr/lib/crt0.o: warning: multiple common of `environ'

>>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

>>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

>>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

>>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

>>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

>>

>> which makes me think the build environment has changed and it was simply

>> that my PR triggered a re-build of the NetBSD VM.

> 

> Yes. I see them also now on the next pullreq I'm trying to

> process. How do I get back to an environment that doesn't

> produce all these warnings?


Maybe building back NetBSD 8.1?

$ git checkout 2cc3e591b3321a~ tests/vm/netbsd
$ make vm-build-netbsd
$ git checkout HEAD tests/vm/netbsd

> 

> thanks

> -- PMM

>
Peter Maydell May 28, 2020, 3:20 p.m. UTC | #6
On Thu, 28 May 2020 at 16:18, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>

> +Gerd

>

> On 5/28/20 5:09 PM, Peter Maydell wrote:

> > Yes. I see them also now on the next pullreq I'm trying to

> > process. How do I get back to an environment that doesn't

> > produce all these warnings?

>

> Maybe building back NetBSD 8.1?


Did that change not itself trigger the VM to be rebuilt ?
If not, can we make it so that updates to the images always
do trigger rebuilds, so that we can catch new warnings
that they introduce at the time rather than later?

thanks
-- PMM
Philippe Mathieu-Daudé May 28, 2020, 3:26 p.m. UTC | #7
On 5/28/20 5:20 PM, Peter Maydell wrote:
> On Thu, 28 May 2020 at 16:18, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:

>>

>> +Gerd

>>

>> On 5/28/20 5:09 PM, Peter Maydell wrote:

>>> Yes. I see them also now on the next pullreq I'm trying to

>>> process. How do I get back to an environment that doesn't

>>> produce all these warnings?

>>

>> Maybe building back NetBSD 8.1?

> 

> Did that change not itself trigger the VM to be rebuilt ?

> If not, can we make it so that updates to the images always

> do trigger rebuilds, so that we can catch new warnings

> that they introduce at the time rather than later?


This is how it should work... How do you run your VM builds?
Gerd Hoffmann May 28, 2020, 3:38 p.m. UTC | #8
On Thu, May 28, 2020 at 05:18:42PM +0200, Philippe Mathieu-Daudé wrote:
> +Gerd

> 

> On 5/28/20 5:09 PM, Peter Maydell wrote:

> > On Thu, 28 May 2020 at 15:57, Alex Bennée <alex.bennee@linaro.org> wrote:

> >> I get these on commit ddc760832fa8cf5e93b9d9e6e854a5114ac63510:

> >>

> >>     LINK    arm-softmmu/qemu-system-arm

> >>   ld: /usr/lib/libc.so and /usr/lib/crt0.o: warning: multiple common of `environ'

> >>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

> >>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

> >>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

> >>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8

> >>   ld: warning: libintl.so.1, needed by /usr/pkg/lib/libgio-2.0.so, may conflict with libintl.so.8


Hmm, on a quick glance this looks like a netbsd packaging bug ...

> Maybe building back NetBSD 8.1?

> 

> $ git checkout 2cc3e591b3321a~ tests/vm/netbsd

> $ make vm-build-netbsd

> $ git checkout HEAD tests/vm/netbsd


The *nsd installs fetch and install a bunch of addon packages, so when
these are updated a netbsd image rebuild will use the newer versions.

IIRC both tests/vm/netbsd and tests/vm/basevm.py changes will trigger
and netbsd image rebuild.  If you want avoid that you have to touch the
disk image after git checkout so make thinks it is up-to-date and
doesn't try to rebuild it.

take care,
  Gerd
Peter Maydell May 28, 2020, 4:07 p.m. UTC | #9
On Thu, 28 May 2020 at 16:26, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> > Did that change not itself trigger the VM to be rebuilt ?

> > If not, can we make it so that updates to the images always

> > do trigger rebuilds, so that we can catch new warnings

> > that they introduce at the time rather than later?

>

> This is how it should work... How do you run your VM builds?


git fetch pmaydell
git checkout --quiet remotes/pmaydell/staging
make -C build vm-build-netbsd -j8 V=1

thanks
-- PMM
Alex Bennée May 28, 2020, 5:19 p.m. UTC | #10
Peter Maydell <peter.maydell@linaro.org> writes:

> On Thu, 28 May 2020 at 16:18, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:

>>

>> +Gerd

>>

>> On 5/28/20 5:09 PM, Peter Maydell wrote:

>> > Yes. I see them also now on the next pullreq I'm trying to

>> > process. How do I get back to an environment that doesn't

>> > produce all these warnings?

>>

>> Maybe building back NetBSD 8.1?

>

> Did that change not itself trigger the VM to be rebuilt ?

> If not, can we make it so that updates to the images always

> do trigger rebuilds, so that we can catch new warnings

> that they introduce at the time rather than later?


$(IMAGES_DIR)/%.img:	$(SRC_PATH)/tests/vm/% \

So netbsdb.img should have been rebuilt when tests/vm/netbsd was
touched. However maybe the packages have been updated upstream since? As
we also have:

			$(SRC_PATH)/tests/vm/basevm.py \
			$(SRC_PATH)/tests/vm/Makefile.include

I suspect the genisoimage change to basevm triggered a re-build grabbing
the latest packages.

-- 
Alex Bennée
Peter Maydell May 29, 2020, 6:25 p.m. UTC | #11
On Wed, 27 May 2020 at 15:54, Alex Bennée <alex.bennee@linaro.org> wrote:
>

> The following changes since commit ddc760832fa8cf5e93b9d9e6e854a5114ac63510:

>

>   Merge remote-tracking branch 'remotes/gkurz/tags/9p-next-2020-05-26' into staging (2020-05-26 14:05:53 +0100)

>

> are available in the Git repository at:

>

>   https://github.com/stsquad/qemu.git tags/pull-testing-tcg-plugins-270520-1

>

> for you to fetch changes up to 919bfbf5d6569b63a374332292cf3d2355a6d6c3:

>

>   tests/tcg: add new threadcount test (2020-05-27 14:26:49 +0100)

>

> ----------------------------------------------------------------

> Testing and one plugin fix:

>

>   - support alternates for genisoimage to test/vm

>   - add clang++ to clang tests

>   - fix record/replay smoke test

>   - enable more softfloat tests

>   - better detection of hung gdb

>   - upgrade aarch64 tcg test x-compile to gcc-10

>   - fix plugin cpu_index clash vs threads



Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.

-- PMM