.gitlab-ci.yml | 13 +--
.shippable.yml | 9 +-
.travis.yml | 2 +-
Makefile | 3 +-
hw/i386/Kconfig | 4 +-
qemu.nsi | 11 ++
scripts/archive-source.sh | 18 ++--
tests/Makefile.include | 10 +-
tests/check-block.sh | 44 ++++++--
tests/docker/Makefile.include | 6 +-
tests/docker/dockerfiles/debian-win32-cross.docker | 10 +-
tests/docker/dockerfiles/debian-win64-cross.docker | 10 +-
tests/docker/dockerfiles/debian10.docker | 1 +
.../{debian8-mxe.docker => debian9-mxe.docker} | 11 +-
tests/docker/dockerfiles/debian9.docker | 1 +
tests/docker/dockerfiles/fedora.docker | 4 +
tests/docker/dockerfiles/ubuntu.docker | 3 +-
tests/docker/dockerfiles/ubuntu1804.docker | 3 +-
tests/docker/run | 4 +-
tests/docker/test-mingw | 4 +-
tests/docker/test-misc | 22 ++++
tests/migration-test.c | 19 ++--
tests/qemu-iotests-quick.sh | 8 --
tests/qemu-iotests/check | 4 +-
tests/qemu-iotests/group | 120 +++++++++++----------
25 files changed, 212 insertions(+), 132 deletions(-)
rename tests/docker/dockerfiles/{debian8-mxe.docker => debian9-mxe.docker} (56%)
create mode 100755 tests/docker/test-misc
delete mode 100755 tests/qemu-iotests-quick.sh
The following changes since commit 23da9e297b4120ca9702cabec91599a44255fe96:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190722' into staging (2019-07-22 15:16:48 +0100)
are available in the Git repository at:
https://github.com/stsquad/qemu.git tags/pull-testing-230719-1
for you to fetch changes up to 2e3b8743cd66f1d0fbc83051b0b6b072a97460cc:
gitlab-ci: Remove qcow2 tests that are handled by "make check" already (2019-07-23 11:33:15 +0100)
----------------------------------------------------------------
Final testing updates:
- docker sphinx updates
- windows build re-enabled in CI
- travis_retry for make check
- quick iotests enabled for make check
- build fixes
----------------------------------------------------------------
Alex Bennée (7):
tests/docker: add test-misc for building tools & docs
tests/migration-test: don't spam the logs when we fail
tests/dockerfiles: update the win cross builds to stretch
shippable: re-enable the windows cross builds
hw/i386: also turn off VMMOUSE is VMPORT is disabled
travis: enable travis_retry for check phase
tests/docker: invoke the DEBUG shell with --noprofile/--norc
Marc-André Lureau (1):
archive-source: also create a stash for submodules
Philippe Mathieu-Daudé (11):
tests/docker: Install Sphinx in the Ubuntu images
tests/docker: Install Sphinx in the Fedora image
tests/docker: Install Ubuntu images noninteractively
tests/docker: Install Sphinx in the Debian images
tests/docker: Install the NSIS tools in the MinGW capable images
tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images
tests/docker: Install texinfo in the Fedora image
buildsys: The NSIS Windows build requires the documentation installed
buildsys: The NSIS Windows build requires qemu-nsis.bmp installed
tests/docker: Let the test-mingw test generate a NSIS installer
NSIS: Add missing firmware blobs
Thomas Huth (4):
tests/qemu-iotests/check: Allow tests without groups
tests/qemu-iotests/group: Remove some more tests from the "auto" group
tests: Run the iotests during "make check" again
gitlab-ci: Remove qcow2 tests that are handled by "make check" already
.gitlab-ci.yml | 13 +--
.shippable.yml | 9 +-
.travis.yml | 2 +-
Makefile | 3 +-
hw/i386/Kconfig | 4 +-
qemu.nsi | 11 ++
scripts/archive-source.sh | 18 ++--
tests/Makefile.include | 10 +-
tests/check-block.sh | 44 ++++++--
tests/docker/Makefile.include | 6 +-
tests/docker/dockerfiles/debian-win32-cross.docker | 10 +-
tests/docker/dockerfiles/debian-win64-cross.docker | 10 +-
tests/docker/dockerfiles/debian10.docker | 1 +
.../{debian8-mxe.docker => debian9-mxe.docker} | 11 +-
tests/docker/dockerfiles/debian9.docker | 1 +
tests/docker/dockerfiles/fedora.docker | 4 +
tests/docker/dockerfiles/ubuntu.docker | 3 +-
tests/docker/dockerfiles/ubuntu1804.docker | 3 +-
tests/docker/run | 4 +-
tests/docker/test-mingw | 4 +-
tests/docker/test-misc | 22 ++++
tests/migration-test.c | 19 ++--
tests/qemu-iotests-quick.sh | 8 --
tests/qemu-iotests/check | 4 +-
tests/qemu-iotests/group | 120 +++++++++++----------
25 files changed, 212 insertions(+), 132 deletions(-)
rename tests/docker/dockerfiles/{debian8-mxe.docker => debian9-mxe.docker} (56%)
create mode 100755 tests/docker/test-misc
delete mode 100755 tests/qemu-iotests-quick.sh
--
2.20.1
On Tue, 23 Jul 2019 at 11:36, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> The following changes since commit 23da9e297b4120ca9702cabec91599a44255fe96:
>
> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190722' into staging (2019-07-22 15:16:48 +0100)
>
> are available in the Git repository at:
>
> https://github.com/stsquad/qemu.git tags/pull-testing-230719-1
>
> for you to fetch changes up to 2e3b8743cd66f1d0fbc83051b0b6b072a97460cc:
>
> gitlab-ci: Remove qcow2 tests that are handled by "make check" already (2019-07-23 11:33:15 +0100)
>
> ----------------------------------------------------------------
> Final testing updates:
>
> - docker sphinx updates
> - windows build re-enabled in CI
> - travis_retry for make check
> - quick iotests enabled for make check
> - build fixes
>
> ----------------------------------------------------------------
'make check-tcg' fails (x86-64 host):
make: Entering directory
'/home/petmay01/linaro/qemu-for-merges/build/all-linux-static'
BUILD debian10
The command '/bin/sh -c DEBIAN_FRONTEND=noninteractive eatmydata
apt install -y --no-install-recommends bison
build-essential ca-certificates clang flex
gettext git pkg-config psmisc
python python3-sphinx texinfo $(apt-get -s
build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)' returned
a non-zero code: 100
Traceback (most recent call last):
File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py",
line 615, in <module>
sys.exit(main())
File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py",
line 611, in main
return args.cmdobj.run(args, argv)
File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py",
line 413, in run
extra_files_cksum=cksum)
File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py",
line 280, in build_image
quiet=quiet)
File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py",
line 207, in _do_check
return subprocess.check_call(self._command + cmd, **kwargs)
File "/usr/lib/python2.7/subprocess.py", line 190, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['docker', 'build', '-t',
'qemu:debian10', '-f', '/tmp/docker_buildBgZdCD/tmp6MJLiZ.docker',
'/tmp/docker_buildBgZdCD']' returned non-zero exit status 100
/home/petmay01/linaro/qemu-for-merges/tests/docker/Makefile.include:53:
recipe for target 'docker-image-debian10' failed
make: *** [docker-image-debian10] Error 1
make: Leaving directory
'/home/petmay01/linaro/qemu-for-merges/build/all-linux-static'
I also got a failure with openbsd which seems to be when
the tests run check-block.sh:
/home/qemu/qemu-test.Dy1Aj3/src/tests/check-block.sh
TEST iotest-qcow2: 001
TEST iotest-qcow2: 002
TEST iotest-qcow2: 003
TEST iotest-qcow2: 004
TEST iotest-qcow2: 005 [not run]
TEST iotest-qcow2: 007 [fail]
QEMU --
"/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../aarch64-softmmu/qemu-system-aarch64"
-nodefaults -machine virt,accel=qtest
QEMU_IMG --
"/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../qemu-img"
QEMU_IO --
"/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../qemu-io"
--cache writeback -f qcow2
QEMU_NBD --
"/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../qemu-nbd"
IMGFMT -- qcow2 (compat=1.1)
IMGPROTO -- file
PLATFORM -- OpenBSD/amd64 openbsd 6.5
TEST_DIR -- /home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/scratch
SOCKET_SCM_HELPER --
--- /home/qemu/qemu-test.Dy1Aj3/src/tests/qemu-iotests/007.out Tue
Jul 23 10:49:15 2019
+++ /home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/007.out.bad
Tue Jul 23 11:10:21 2019
@@ -2,16 +2,7 @@
creating image
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
-savevm 1
-savevm 2
-savevm 3
-savevm 4
-savevm 5
-savevm 6
-savevm 7
-savevm 8
-savevm 9
-savevm 10
+./007: line 51: seq: command not found
[and some other failures]
I see Thomas Huth has a patch on-list for that, but this
didn't manifest as a problem before this pullreq.
thanks
-- PMM
Peter Maydell <peter.maydell@linaro.org> writes: > On Tue, 23 Jul 2019 at 11:36, Alex Bennée <alex.bennee@linaro.org> wrote: >> >> The following changes since commit 23da9e297b4120ca9702cabec91599a44255fe96: >> >> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190722' into staging (2019-07-22 15:16:48 +0100) >> >> are available in the Git repository at: >> >> https://github.com/stsquad/qemu.git tags/pull-testing-230719-1 >> >> for you to fetch changes up to 2e3b8743cd66f1d0fbc83051b0b6b072a97460cc: >> >> gitlab-ci: Remove qcow2 tests that are handled by "make check" already (2019-07-23 11:33:15 +0100) >> >> ---------------------------------------------------------------- >> Final testing updates: >> >> - docker sphinx updates >> - windows build re-enabled in CI >> - travis_retry for make check >> - quick iotests enabled for make check >> - build fixes >> >> ---------------------------------------------------------------- > > 'make check-tcg' fails (x86-64 host): > > make: Entering directory > '/home/petmay01/linaro/qemu-for-merges/build/all-linux-static' > BUILD debian10 > The command '/bin/sh -c DEBIAN_FRONTEND=noninteractive eatmydata > apt install -y --no-install-recommends bison > build-essential ca-certificates clang flex > gettext git pkg-config psmisc > python python3-sphinx texinfo $(apt-get -s > build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)' returned > a non-zero code: 100 > Traceback (most recent call last): > File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", > line 615, in <module> > sys.exit(main()) > File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", > line 611, in main > return args.cmdobj.run(args, argv) > File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", > line 413, in run > extra_files_cksum=cksum) > File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", > line 280, in build_image > quiet=quiet) > File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", > line 207, in _do_check > return subprocess.check_call(self._command + cmd, **kwargs) > File "/usr/lib/python2.7/subprocess.py", line 190, in check_call > raise CalledProcessError(retcode, cmd) > subprocess.CalledProcessError: Command '['docker', 'build', '-t', > 'qemu:debian10', '-f', '/tmp/docker_buildBgZdCD/tmp6MJLiZ.docker', > '/tmp/docker_buildBgZdCD']' returned non-zero exit status 100 > /home/petmay01/linaro/qemu-for-merges/tests/docker/Makefile.include:53: > recipe for target 'docker-image-debian10' failed > make: *** [docker-image-debian10] Error 1 > make: Leaving directory > '/home/petmay01/linaro/qemu-for-merges/build/all-linux-static' Odd. Does: make docker-image-debian10 V=1 fail for you? Can you retry with: make docker-image-debian10 V=1 NOCACHE=1 > > I also got a failure with openbsd which seems to be when > the tests run check-block.sh: > > /home/qemu/qemu-test.Dy1Aj3/src/tests/check-block.sh > TEST iotest-qcow2: 001 > TEST iotest-qcow2: 002 > TEST iotest-qcow2: 003 > TEST iotest-qcow2: 004 > TEST iotest-qcow2: 005 [not run] > TEST iotest-qcow2: 007 [fail] > QEMU -- > "/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../aarch64-softmmu/qemu-system-aarch64" > -nodefaults -machine virt,accel=qtest > QEMU_IMG -- > "/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../qemu-img" > QEMU_IO -- > "/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../qemu-io" > --cache writeback -f qcow2 > QEMU_NBD -- > "/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../qemu-nbd" > IMGFMT -- qcow2 (compat=1.1) > IMGPROTO -- file > PLATFORM -- OpenBSD/amd64 openbsd 6.5 > TEST_DIR -- /home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/scratch > SOCKET_SCM_HELPER -- > > --- /home/qemu/qemu-test.Dy1Aj3/src/tests/qemu-iotests/007.out Tue > Jul 23 10:49:15 2019 > +++ /home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/007.out.bad > Tue Jul 23 11:10:21 2019 > @@ -2,16 +2,7 @@ > > creating image > Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 > -savevm 1 > -savevm 2 > -savevm 3 > -savevm 4 > -savevm 5 > -savevm 6 > -savevm 7 > -savevm 8 > -savevm 9 > -savevm 10 > +./007: line 51: seq: command not found > > [and some other failures] > > I see Thomas Huth has a patch on-list for that, but this > didn't manifest as a problem before this pullreq. OK, I'll add it and rebuild the PR. Have you noticed any issues with check-acceptance? > > thanks > -- PMM -- Alex Bennée
On 7/23/19 1:46 PM, Alex Bennée wrote: > > Peter Maydell <peter.maydell@linaro.org> writes: > >> On Tue, 23 Jul 2019 at 11:36, Alex Bennée <alex.bennee@linaro.org> wrote: >>> >>> The following changes since commit 23da9e297b4120ca9702cabec91599a44255fe96: >>> >>> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190722' into staging (2019-07-22 15:16:48 +0100) >>> >>> are available in the Git repository at: >>> >>> https://github.com/stsquad/qemu.git tags/pull-testing-230719-1 >>> >>> for you to fetch changes up to 2e3b8743cd66f1d0fbc83051b0b6b072a97460cc: >>> >>> gitlab-ci: Remove qcow2 tests that are handled by "make check" already (2019-07-23 11:33:15 +0100) >>> >>> ---------------------------------------------------------------- >>> Final testing updates: >>> >>> - docker sphinx updates >>> - windows build re-enabled in CI >>> - travis_retry for make check >>> - quick iotests enabled for make check >>> - build fixes >>> >>> ---------------------------------------------------------------- >> >> 'make check-tcg' fails (x86-64 host): >> >> make: Entering directory >> '/home/petmay01/linaro/qemu-for-merges/build/all-linux-static' >> BUILD debian10 >> The command '/bin/sh -c DEBIAN_FRONTEND=noninteractive eatmydata >> apt install -y --no-install-recommends bison >> build-essential ca-certificates clang flex >> gettext git pkg-config psmisc >> python python3-sphinx texinfo $(apt-get -s >> build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)' returned >> a non-zero code: 100 >> Traceback (most recent call last): >> File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", >> line 615, in <module> >> sys.exit(main()) >> File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", >> line 611, in main >> return args.cmdobj.run(args, argv) >> File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", >> line 413, in run >> extra_files_cksum=cksum) >> File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", >> line 280, in build_image >> quiet=quiet) >> File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", >> line 207, in _do_check >> return subprocess.check_call(self._command + cmd, **kwargs) >> File "/usr/lib/python2.7/subprocess.py", line 190, in check_call >> raise CalledProcessError(retcode, cmd) >> subprocess.CalledProcessError: Command '['docker', 'build', '-t', >> 'qemu:debian10', '-f', '/tmp/docker_buildBgZdCD/tmp6MJLiZ.docker', >> '/tmp/docker_buildBgZdCD']' returned non-zero exit status 100 >> /home/petmay01/linaro/qemu-for-merges/tests/docker/Makefile.include:53: >> recipe for target 'docker-image-debian10' failed Yes, we should definitively improve this error report. >> make: *** [docker-image-debian10] Error 1 >> make: Leaving directory >> '/home/petmay01/linaro/qemu-for-merges/build/all-linux-static' > > Odd. Does: > > make docker-image-debian10 V=1 > > fail for you? Can you retry with: > > make docker-image-debian10 V=1 NOCACHE=1 Should we use a stable tag for the stable release? Such: -- >8 -- diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker index aeeb151b52..0f2800377d 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -7,7 +7,7 @@ # On its own you can't build much but the docker-foo-cross targets # build on top of the base debian image. # -FROM debian:buster-slim +FROM debian:buster-20190708-slim # Duplicate deb line as deb-src --- >> >> I also got a failure with openbsd which seems to be when >> the tests run check-block.sh: >> >> /home/qemu/qemu-test.Dy1Aj3/src/tests/check-block.sh >> TEST iotest-qcow2: 001 >> TEST iotest-qcow2: 002 >> TEST iotest-qcow2: 003 >> TEST iotest-qcow2: 004 >> TEST iotest-qcow2: 005 [not run] >> TEST iotest-qcow2: 007 [fail] >> QEMU -- >> "/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../aarch64-softmmu/qemu-system-aarch64" >> -nodefaults -machine virt,accel=qtest >> QEMU_IMG -- >> "/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../qemu-img" >> QEMU_IO -- >> "/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../qemu-io" >> --cache writeback -f qcow2 >> QEMU_NBD -- >> "/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../qemu-nbd" >> IMGFMT -- qcow2 (compat=1.1) >> IMGPROTO -- file >> PLATFORM -- OpenBSD/amd64 openbsd 6.5 >> TEST_DIR -- /home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/scratch >> SOCKET_SCM_HELPER -- >> >> --- /home/qemu/qemu-test.Dy1Aj3/src/tests/qemu-iotests/007.out Tue >> Jul 23 10:49:15 2019 >> +++ /home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/007.out.bad >> Tue Jul 23 11:10:21 2019 >> @@ -2,16 +2,7 @@ >> >> creating image >> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 >> -savevm 1 >> -savevm 2 >> -savevm 3 >> -savevm 4 >> -savevm 5 >> -savevm 6 >> -savevm 7 >> -savevm 8 >> -savevm 9 >> -savevm 10 >> +./007: line 51: seq: command not found >> >> [and some other failures] >> >> I see Thomas Huth has a patch on-list for that, but this >> didn't manifest as a problem before this pullreq. > > OK, I'll add it and rebuild the PR. But Thomas got another error later... > > Have you noticed any issues with check-acceptance? > >> >> thanks >> -- PMM > > > -- > Alex Bennée >
Philippe Mathieu-Daudé <philmd@redhat.com> writes: > On 7/23/19 1:46 PM, Alex Bennée wrote: >> >> Peter Maydell <peter.maydell@linaro.org> writes: >> >>> On Tue, 23 Jul 2019 at 11:36, Alex Bennée <alex.bennee@linaro.org> wrote: >>>> >>>> The following changes since commit 23da9e297b4120ca9702cabec91599a44255fe96: >>>> >>>> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190722' into staging (2019-07-22 15:16:48 +0100) >>>> >>>> are available in the Git repository at: >>>> >>>> https://github.com/stsquad/qemu.git tags/pull-testing-230719-1 >>>> >>>> for you to fetch changes up to 2e3b8743cd66f1d0fbc83051b0b6b072a97460cc: >>>> >>>> gitlab-ci: Remove qcow2 tests that are handled by "make check" already (2019-07-23 11:33:15 +0100) >>>> >>>> ---------------------------------------------------------------- >>>> Final testing updates: >>>> >>>> - docker sphinx updates >>>> - windows build re-enabled in CI >>>> - travis_retry for make check >>>> - quick iotests enabled for make check >>>> - build fixes >>>> >>>> ---------------------------------------------------------------- >>> >>> 'make check-tcg' fails (x86-64 host): >>> >>> make: Entering directory >>> '/home/petmay01/linaro/qemu-for-merges/build/all-linux-static' >>> BUILD debian10 >>> The command '/bin/sh -c DEBIAN_FRONTEND=noninteractive eatmydata >>> apt install -y --no-install-recommends bison >>> build-essential ca-certificates clang flex >>> gettext git pkg-config psmisc >>> python python3-sphinx texinfo $(apt-get -s >>> build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)' returned >>> a non-zero code: 100 >>> Traceback (most recent call last): >>> File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", >>> line 615, in <module> >>> sys.exit(main()) >>> File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", >>> line 611, in main >>> return args.cmdobj.run(args, argv) >>> File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", >>> line 413, in run >>> extra_files_cksum=cksum) >>> File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", >>> line 280, in build_image >>> quiet=quiet) >>> File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py", >>> line 207, in _do_check >>> return subprocess.check_call(self._command + cmd, **kwargs) >>> File "/usr/lib/python2.7/subprocess.py", line 190, in check_call >>> raise CalledProcessError(retcode, cmd) >>> subprocess.CalledProcessError: Command '['docker', 'build', '-t', >>> 'qemu:debian10', '-f', '/tmp/docker_buildBgZdCD/tmp6MJLiZ.docker', >>> '/tmp/docker_buildBgZdCD']' returned non-zero exit status 100 >>> /home/petmay01/linaro/qemu-for-merges/tests/docker/Makefile.include:53: >>> recipe for target 'docker-image-debian10' failed > > Yes, we should definitively improve this error report. > >>> make: *** [docker-image-debian10] Error 1 >>> make: Leaving directory >>> '/home/petmay01/linaro/qemu-for-merges/build/all-linux-static' >> >> Odd. Does: >> >> make docker-image-debian10 V=1 >> >> fail for you? Can you retry with: >> >> make docker-image-debian10 V=1 NOCACHE=1 > > Should we use a stable tag for the stable release? Such: > > -- >8 -- > diff --git a/tests/docker/dockerfiles/debian10.docker > b/tests/docker/dockerfiles/debian10.docker > index aeeb151b52..0f2800377d 100644 > --- a/tests/docker/dockerfiles/debian10.docker > +++ b/tests/docker/dockerfiles/debian10.docker > @@ -7,7 +7,7 @@ > # On its own you can't build much but the docker-foo-cross targets > # build on top of the base debian image. > # > -FROM debian:buster-slim > +FROM debian:buster-20190708-slim I don't think so - Buster is stable now - I think the problem is stale cache states from previous interrupted builds. If NOCACHE makes it go away then I think we are good. > > # Duplicate deb line as deb-src > --- > >>> >>> I also got a failure with openbsd which seems to be when >>> the tests run check-block.sh: >>> >>> /home/qemu/qemu-test.Dy1Aj3/src/tests/check-block.sh >>> TEST iotest-qcow2: 001 >>> TEST iotest-qcow2: 002 >>> TEST iotest-qcow2: 003 >>> TEST iotest-qcow2: 004 >>> TEST iotest-qcow2: 005 [not run] >>> TEST iotest-qcow2: 007 [fail] >>> QEMU -- >>> "/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../aarch64-softmmu/qemu-system-aarch64" >>> -nodefaults -machine virt,accel=qtest >>> QEMU_IMG -- >>> "/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../qemu-img" >>> QEMU_IO -- >>> "/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../qemu-io" >>> --cache writeback -f qcow2 >>> QEMU_NBD -- >>> "/home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/../../qemu-nbd" >>> IMGFMT -- qcow2 (compat=1.1) >>> IMGPROTO -- file >>> PLATFORM -- OpenBSD/amd64 openbsd 6.5 >>> TEST_DIR -- /home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/scratch >>> SOCKET_SCM_HELPER -- >>> >>> --- /home/qemu/qemu-test.Dy1Aj3/src/tests/qemu-iotests/007.out Tue >>> Jul 23 10:49:15 2019 >>> +++ /home/qemu/qemu-test.Dy1Aj3/build/tests/qemu-iotests/007.out.bad >>> Tue Jul 23 11:10:21 2019 >>> @@ -2,16 +2,7 @@ >>> >>> creating image >>> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 >>> -savevm 1 >>> -savevm 2 >>> -savevm 3 >>> -savevm 4 >>> -savevm 5 >>> -savevm 6 >>> -savevm 7 >>> -savevm 8 >>> -savevm 9 >>> -savevm 10 >>> +./007: line 51: seq: command not found >>> >>> [and some other failures] >>> >>> I see Thomas Huth has a patch on-list for that, but this >>> didn't manifest as a problem before this pullreq. >> >> OK, I'll add it and rebuild the PR. > > But Thomas got another error later... > >> >> Have you noticed any issues with check-acceptance? >> >>> >>> thanks >>> -- PMM >> >> >> -- >> Alex Bennée >> -- Alex Bennée
On Tue, 23 Jul 2019 at 13:16, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > On 7/23/19 1:46 PM, Alex Bennée wrote: > >> I see Thomas Huth has a patch on-list for that, but this > >> didn't manifest as a problem before this pullreq. > > > > OK, I'll add it and rebuild the PR. > > But Thomas got another error later... If we're not sure what all the needed fixes are we should probably just drop the change that starts running the iotests under 'make check'. Otherwise this pullreq is going to miss rc2, and it's too big to go into rc3. thanks -- PMM
Peter Maydell <peter.maydell@linaro.org> writes: > On Tue, 23 Jul 2019 at 13:16, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: >> >> On 7/23/19 1:46 PM, Alex Bennée wrote: >> >> I see Thomas Huth has a patch on-list for that, but this >> >> didn't manifest as a problem before this pullreq. >> > >> > OK, I'll add it and rebuild the PR. >> >> But Thomas got another error later... > > If we're not sure what all the needed fixes are we > should probably just drop the change that starts > running the iotests under 'make check'. Otherwise this > pullreq is going to miss rc2, and it's too big to go into rc3. I'm just double checking now - it does seem OpenBSD is very slow even with 18 cores assigned. > > thanks > -- PMM -- Alex Bennée
On Tue, 23 Jul 2019 at 13:58, Alex Bennée <alex.bennee@linaro.org> wrote: > > > Peter Maydell <peter.maydell@linaro.org> writes: > > > On Tue, 23 Jul 2019 at 13:16, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > >> > >> On 7/23/19 1:46 PM, Alex Bennée wrote: > >> >> I see Thomas Huth has a patch on-list for that, but this > >> >> didn't manifest as a problem before this pullreq. > >> > > >> > OK, I'll add it and rebuild the PR. > >> > >> But Thomas got another error later... > > > > If we're not sure what all the needed fixes are we > > should probably just drop the change that starts > > running the iotests under 'make check'. Otherwise this > > pullreq is going to miss rc2, and it's too big to go into rc3. > > I'm just double checking now - it does seem OpenBSD is very slow even > with 18 cores assigned. We should avoid enabling "very slow" tests in make check too... thanks -- PMM
On 23/07/2019 15.01, Peter Maydell wrote: > On Tue, 23 Jul 2019 at 13:58, Alex Bennée <alex.bennee@linaro.org> wrote: >> >> >> Peter Maydell <peter.maydell@linaro.org> writes: >> >>> On Tue, 23 Jul 2019 at 13:16, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: >>>> >>>> On 7/23/19 1:46 PM, Alex Bennée wrote: >>>>>> I see Thomas Huth has a patch on-list for that, but this >>>>>> didn't manifest as a problem before this pullreq. >>>>> >>>>> OK, I'll add it and rebuild the PR. >>>> >>>> But Thomas got another error later... >>> >>> If we're not sure what all the needed fixes are we >>> should probably just drop the change that starts >>> running the iotests under 'make check'. Otherwise this >>> pullreq is going to miss rc2, and it's too big to go into rc3. I think OpenBSD was the final thing that is not working. I've checked freebsd and macOS and they were working fine for me there. The netbsd image does not have "bash", so the tests are skipped there. >> I'm just double checking now - it does seem OpenBSD is very slow even >> with 18 cores assigned. > > We should avoid enabling "very slow" tests in make check too... It's not the iotests that are slow here, it's the whole openbsd image - even compiling is way slower than natively... it feels like it is ignoring the multiple cores and only running single-threaded. Thomas
On Tue, 23 Jul 2019 at 12:46, Alex Bennée <alex.bennee@linaro.org> wrote:
> Odd. Does:
>
> make docker-image-debian10 V=1
>
> fail for you?
Yes. The files apt tries to download do not appear to be
on the mirror:
e104462:bionic:all-linux-static$ make docker-image-debian10 V=1
/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py build
qemu:debian10 /home/petmay01/linaro/qemu-for-merges/tests/docker/dockerfiles/debian10.docker
--add-current-user
Sending build context to Docker daemon 3.072kB
Step 1/7 : FROM debian:buster-slim
---> 7e86f6dc8410
Step 2/7 : RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >>
/etc/apt/sources.list
---> Using cache
---> a16e81a24df9
Step 3/7 : RUN apt update
---> Using cache
---> 272778d384a0
Step 4/7 : RUN DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata
---> Using cache
---> 0113e60b5abe
Step 5/7 : RUN DEBIAN_FRONTEND=noninteractive eatmydata apt
install -y --no-install-recommends bison
build-essential ca-certificates clang flex
gettext git pkg-config psmisc
python python3-sphinx texinfo $(apt-get -s
build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
---> Running in 9f66f5f38684
WARNING: apt does not have a stable CLI interface. Use with caution in scripts.
[...]
After this operation, 791 MB of additional disk space will be used.
Err:1 http://cdn-fastly.deb.debian.org/debian buster/main amd64
perl-base amd64 5.28.1-4
404 Not Found [IP: 151.101.16.204 80]
Err:2 http://cdn-fastly.deb.debian.org/debian buster/main amd64
libsystemd0 amd64 240-5
404 Not Found [IP: 151.101.16.204 80]
Err:3 http://cdn-fastly.deb.debian.org/debian buster/main amd64
gcc-8-base amd64 8.2.0-16
404 Not Found [IP: 151.101.16.204 80]
Err:4 http://cdn-fastly.deb.debian.org/debian buster/main amd64
libgcc1 amd64 1:8.2.0-16
404 Not Found [IP: 151.101.16.204 80]
Err:5 http://cdn-fastly.deb.debian.org/debian buster/main amd64
libstdc++6 amd64 8.2.0-16
404 Not Found [IP: 151.101.16.204 80]
Err:6 http://cdn-fastly.deb.debian.org/debian buster/main amd64 libc6
amd64 2.28-6
404 Not Found [IP: 151.101.16.204 80]
though some are present, eg
Get:210 http://cdn-fastly.deb.debian.org/debian buster/main amd64
libatk1.0-data all 2.30.0-2 [145 kB]
> Can you retry with:
>
> make docker-image-debian10 V=1 NOCACHE=1
Yes, this works. It looks like docker is caching the
result of the "apt update" state, when it really needs
to rerun this every time because the state on the servers
may have changed.
thanks
-- PMM
On 7/23/19 3:33 PM, Peter Maydell wrote: > On Tue, 23 Jul 2019 at 12:46, Alex Bennée <alex.bennee@linaro.org> wrote: >> Odd. Does: >> >> make docker-image-debian10 V=1 >> >> fail for you? > > Yes. The files apt tries to download do not appear to be > on the mirror: > e104462:bionic:all-linux-static$ make docker-image-debian10 V=1 > /home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py build > qemu:debian10 /home/petmay01/linaro/qemu-for-merges/tests/docker/dockerfiles/debian10.docker > --add-current-user > Sending build context to Docker daemon 3.072kB > Step 1/7 : FROM debian:buster-slim > ---> 7e86f6dc8410 > Step 2/7 : RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> > /etc/apt/sources.list > ---> Using cache > ---> a16e81a24df9 > Step 3/7 : RUN apt update > ---> Using cache > ---> 272778d384a0 > Step 4/7 : RUN DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata > ---> Using cache > ---> 0113e60b5abe > Step 5/7 : RUN DEBIAN_FRONTEND=noninteractive eatmydata apt > install -y --no-install-recommends bison > build-essential ca-certificates clang flex > gettext git pkg-config psmisc > python python3-sphinx texinfo $(apt-get -s > build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) > ---> Running in 9f66f5f38684 > > WARNING: apt does not have a stable CLI interface. Use with caution in scripts. > [...] > After this operation, 791 MB of additional disk space will be used. > Err:1 http://cdn-fastly.deb.debian.org/debian buster/main amd64 > perl-base amd64 5.28.1-4 > 404 Not Found [IP: 151.101.16.204 80] > Err:2 http://cdn-fastly.deb.debian.org/debian buster/main amd64 > libsystemd0 amd64 240-5 > 404 Not Found [IP: 151.101.16.204 80] > Err:3 http://cdn-fastly.deb.debian.org/debian buster/main amd64 > gcc-8-base amd64 8.2.0-16 > 404 Not Found [IP: 151.101.16.204 80] > Err:4 http://cdn-fastly.deb.debian.org/debian buster/main amd64 > libgcc1 amd64 1:8.2.0-16 > 404 Not Found [IP: 151.101.16.204 80] > Err:5 http://cdn-fastly.deb.debian.org/debian buster/main amd64 > libstdc++6 amd64 8.2.0-16 > 404 Not Found [IP: 151.101.16.204 80] > Err:6 http://cdn-fastly.deb.debian.org/debian buster/main amd64 libc6 > amd64 2.28-6 > 404 Not Found [IP: 151.101.16.204 80] > > though some are present, eg > > Get:210 http://cdn-fastly.deb.debian.org/debian buster/main amd64 > libatk1.0-data all 2.30.0-2 [145 kB] > >> Can you retry with: >> >> make docker-image-debian10 V=1 NOCACHE=1 > > Yes, this works. It looks like docker is caching the > result of the "apt update" state, when it really needs > to rerun this every time because the state on the servers > may have changed. Yeah, I fixed Ubuntu here: https://git.qemu.org/?p=qemu.git;a=commitdiff;h=beac6a98f6eb271f2520a329ca051313afd70a69 But failed to explain this reason while trying to fix Debian: https://lists.gnu.org/archive/html/qemu-devel/2017-05/msg02081.html
From: Marc-André Lureau <marcandre.lureau@redhat.com>
"git archive" fails when a submodule has a modification, because "git
stash create" doesn't handle submodules. Let's teach our
archive-source.sh to handle modifications in submodules the same way
as qemu tree, by creating a stash.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20190708200250.12017-1-marcandre.lureau@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
index ca94e49978f..fb5d6b3918d 100755
--- a/scripts/archive-source.sh
+++ b/scripts/archive-source.sh
@@ -39,14 +39,16 @@ function cleanup() {
}
trap "cleanup" 0 1 2 3 15
-if git diff-index --quiet HEAD -- &>/dev/null
-then
- HEAD=HEAD
-else
- HEAD=$(git stash create)
-fi
+function tree_ish() {
+ local retval='HEAD'
+ if ! git diff-index --quiet --ignore-submodules=all HEAD -- &>/dev/null
+ then
+ retval=$(git stash create)
+ fi
+ echo "$retval"
+}
-git archive --format tar $HEAD > "$tar_file"
+git archive --format tar "$(tree_ish)" > "$tar_file"
test $? -ne 0 && error "failed to archive qemu"
for sm in $submodules; do
status="$(git submodule status "$sm")"
@@ -62,7 +64,7 @@ for sm in $submodules; do
echo "WARNING: submodule $sm is out of sync"
;;
esac
- (cd $sm; git archive --format tar --prefix "$sm/" $smhash) > "$sub_file"
+ (cd $sm; git archive --format tar --prefix "$sm/" $(tree_ish)) > "$sub_file"
test $? -ne 0 && error "failed to archive submodule $sm ($smhash)"
tar --concatenate --file "$tar_file" "$sub_file"
test $? -ne 0 && error "failed append submodule $sm to $tar_file"
--
2.20.1
Add yet another test type so we cna quickly exercise the miscellaneous build products of the build system under various docer configurations. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> diff --git a/tests/docker/test-misc b/tests/docker/test-misc new file mode 100755 index 00000000000..d480afedca7 --- /dev/null +++ b/tests/docker/test-misc @@ -0,0 +1,22 @@ +#!/bin/bash -e +# +# Build the miscellaneous components +# +# Copyright (c) 2019 Linaro Ltd. +# +# Authors: +# Alex Bennée <alex.bennee@linaro.org> +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +. common.rc + +cd "$BUILD_DIR" + +# build everything else but QEMU +configure_qemu --disable-user --disable-system --enable-docs --enable-tools +build_qemu +install_qemu -- 2.20.1
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Since commit 5f71eac06e the Sphinx tool is required
to build the rST documentation.
This fixes:
$ ./configure --enable-docs
ERROR: User requested feature docs
configure was not able to find it.
Install texinfo, Perl/perl-podlators and python-sphinx
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20190711102710.2263-1-philmd@redhat.com>
[AJB: also add /usr/libexec/python3-sphinx/ to PATH]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 619d1b5656d..2350d494d9a 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -76,6 +76,7 @@ ENV PACKAGES \
perl-Test-Harness \
pixman-devel \
python3 \
+ python3-sphinx \
PyYAML \
rdma-core-devel \
SDL2-devel \
@@ -95,4 +96,5 @@ ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
RUN dnf install -y $PACKAGES
RUN rpm -q $PACKAGES | sort > /packages.txt
+ENV PATH $PATH:/usr/libexec/python3-sphinx/
ENV FEATURES mingw clang pyyaml asan
--
2.20.1
Quite often the information about which test failed is hidden by the
wall of repeated failures for each page. Stop outputting the error
after 10 bad pages and just summarise the total damage at the end.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
diff --git a/tests/migration-test.c b/tests/migration-test.c
index a4feb9545d9..c1968740abe 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -308,7 +308,7 @@ static void check_guests_ram(QTestState *who)
uint8_t first_byte;
uint8_t last_byte;
bool hit_edge = false;
- bool bad = false;
+ int bad = 0;
qtest_memread(who, start_address, &first_byte, 1);
last_byte = first_byte;
@@ -327,15 +327,20 @@ static void check_guests_ram(QTestState *who)
hit_edge = true;
last_byte = b;
} else {
- fprintf(stderr, "Memory content inconsistency at %x"
- " first_byte = %x last_byte = %x current = %x"
- " hit_edge = %x\n",
- address, first_byte, last_byte, b, hit_edge);
- bad = true;
+ bad++;
+ if (bad <= 10) {
+ fprintf(stderr, "Memory content inconsistency at %x"
+ " first_byte = %x last_byte = %x current = %x"
+ " hit_edge = %x\n",
+ address, first_byte, last_byte, b, hit_edge);
+ }
}
}
}
- g_assert_false(bad);
+ if (bad >= 10) {
+ fprintf(stderr, "and in another %d pages", bad - 10);
+ }
+ g_assert(bad == 0);
}
static void cleanup(const char *filename)
--
2.20.1
The pkg.mxe.cc repo has been restored.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/.shippable.yml b/.shippable.yml
index f2ffef21d11..f74a3de3ffd 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -7,11 +7,10 @@ env:
matrix:
- IMAGE=debian-amd64
TARGET_LIST=x86_64-softmmu,x86_64-linux-user
- # currently disabled as the mxe.cc repos are down
- # - IMAGE=debian-win32-cross
- # TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu
- # - IMAGE=debian-win64-cross
- # TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu
+ - IMAGE=debian-win32-cross
+ TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu
+ - IMAGE=debian-win64-cross
+ TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu
- IMAGE=debian-armel-cross
TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user
- IMAGE=debian-armhf-cross
--
2.20.1
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The 'makeinfo' is required to generate the documentation from
the 'html' Makefile rule (called by 'install-doc').
The NSIS installer uses these files.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190715174817.18981-6-philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 226ac1026fa..4ddc7dd112a 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -87,6 +87,7 @@ ENV PACKAGES \
systemd-devel \
systemtap-sdt-devel \
tar \
+ texinfo \
usbredir-devel \
virglrenderer-devel \
vte291-devel \
--
2.20.1
From: Philippe Mathieu-Daudé <philmd@redhat.com>
This fixes:
$ make installer
[...]
(cd /tmp/qemu-nsis; \
for i in qemu-system-*.exe; do \
arch=${i%.exe}; \
arch=${arch#qemu-system-}; \
echo Section \"$arch\" Section_$arch; \
echo SetOutPath \"\$INSTDIR\"; \
echo File \"\${BINDIR}\\$i\"; \
echo SectionEnd; \
done \
) >/tmp/qemu-nsis/system-emulations.nsh
makensis -V2 -NOCD \
\
-DCONFIG_GTK="y" \
-DBINDIR="/tmp/qemu-nsis" \
\
-DSRCDIR="/source/qemu" \
-DOUTFILE="qemu-setup-4.0.90.exe" \
-DDISPLAYVERSION="4.0.90" \
/source/qemu/qemu.nsi
File: "/tmp/qemu-nsis\qemu-doc.html" -> no files found.
Usage: File [/nonfatal] [/a] ([/r] [/x filespec [...]] filespec [...] |
/oname=outfile one_file_only)
Error in script "/source/qemu/qemu.nsi" on line 173 -- aborting creation process
make: *** [Makefile:1080: qemu-setup-4.0.90.exe] Error 1
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190715174817.18981-7-philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/Makefile b/Makefile
index ecb788b2ce3..b3357691cad 100644
--- a/Makefile
+++ b/Makefile
@@ -1077,7 +1077,7 @@ installer: $(INSTALLER)
INSTDIR=/tmp/qemu-nsis
-$(INSTALLER): $(SRC_PATH)/qemu.nsi
+$(INSTALLER): install-doc $(SRC_PATH)/qemu.nsi
$(MAKE) install prefix=${INSTDIR}
ifdef SIGNCODE
(cd ${INSTDIR}; \
--
2.20.1
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The qemu-nsis.bmp file was not listed with the other blobs, thus
not installed in the ${BINDIR} location.
This fixes:
$ make installer
[...]
(cd /tmp/qemu-nsis; \
for i in qemu-system-*.exe; do \
arch=${i%.exe}; \
arch=${arch#qemu-system-}; \
echo Section \"$arch\" Section_$arch; \
echo SetOutPath \"\$INSTDIR\"; \
echo File \"\${BINDIR}\\$i\"; \
echo SectionEnd; \
done \
) >/tmp/qemu-nsis/system-emulations.nsh
makensis -V2 -NOCD \
-DCONFIG_DOCUMENTATION="y" \
\
-DBINDIR="/tmp/qemu-nsis" \
\
-DSRCDIR="/home/phil/source/qemu" \
-DOUTFILE="qemu-setup-4.0.90.exe" \
-DDISPLAYVERSION="4.0.90" \
/home/phil/source/qemu/qemu.nsi
File: "/tmp/qemu-nsis\*.bmp" -> no files found.
Usage: File [/nonfatal] [/a] ([/r] [/x filespec [...]] filespec [...] |
/oname=outfile one_file_only)
Error in script "/home/phil/source/qemu/qemu.nsi" on line 122 -- aborting creation process
Makefile:1077: recipe for target 'qemu-setup-4.0.90.exe' failed
make: *** [qemu-setup-4.0.90.exe] Error 1
Fixes: https://bugs.launchpad.net/bugs/1836453
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190715174817.18981-8-philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/Makefile b/Makefile
index b3357691cad..cfab1561b9c 100644
--- a/Makefile
+++ b/Makefile
@@ -761,6 +761,7 @@ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \
efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \
efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \
efi-e1000e.rom efi-vmxnet3.rom \
+qemu-nsis.bmp \
bamboo.dtb canyonlands.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \
multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin \
s390-ccw.img s390-netboot.img \
--
2.20.1
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The NSIS installer generates an executable suitable to install
QEMU on Windows.
Suggested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190715174817.18981-9-philmd@redhat.com>
[AJB: also --enable-docs in configure step]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw
index 4b84cfe120a..fdb1c2c879d 100755
--- a/tests/docker/test-mingw
+++ b/tests/docker/test-mingw
@@ -27,8 +27,10 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do
--enable-curl \
--enable-vnc \
--enable-bzip2 \
- --enable-guest-agent
+ --enable-guest-agent \
+ --enable-docs
install_qemu
+ make installer
make clean
done
--
2.20.1
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Various firmwares has been added in the pc-bios/ directory:
- CCW (since commit 0c1fecdd523)
- skiboot (since commit bcad45de6a0)
- EDK2 (since commit f7fa38b74c3)
Since we install qemu-system able to run the architectures
targetted by these firmware, include them in the NSIS exe.
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190723070218.3606-1-philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/qemu.nsi b/qemu.nsi
index 75f1608b9e0..d0df0f4e3a1 100644
--- a/qemu.nsi
+++ b/qemu.nsi
@@ -106,6 +106,9 @@ RequestExecutionLevel admin
;--------------------------------
; The stuff to install.
+;
+; Remember to keep the "Uninstall" section in sync.
+
Section "${PRODUCT} (required)"
SectionIn RO
@@ -122,6 +125,10 @@ Section "${PRODUCT} (required)"
File "${BINDIR}\*.bmp"
File "${BINDIR}\*.bin"
File "${BINDIR}\*.dtb"
+ File "${BINDIR}\*.fd"
+ File "${BINDIR}\*.img"
+ File "${BINDIR}\*.lid"
+ File "${BINDIR}\*.ndrv"
File "${BINDIR}\*.rom"
File "${BINDIR}\openbios-*"
@@ -210,6 +217,10 @@ Section "Uninstall"
Delete "$INSTDIR\*.bin"
Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\*.dtb"
+ Delete "$INSTDIR\*.fd"
+ Delete "$INSTDIR\*.img"
+ Delete "$INSTDIR\*.lid"
+ Delete "$INSTDIR\*.ndrv"
Delete "$INSTDIR\*.rom"
Delete "$INSTDIR\openbios-*"
Delete "$INSTDIR\qemu-img.exe"
--
2.20.1
Commit 97fd1ea8c1 broke the build for --without-default-devices as
VMMOUSE depends on VMPORT.
Fixes: 97fd1ea8c1
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index b9c96ac361e..6350438036f 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -52,6 +52,7 @@ config I440FX
bool
imply E1000_PCI
imply VMPORT
+ imply VMMOUSE
select PC_PCI
select PC_ACPI
select ACPI_SMBUS
@@ -59,7 +60,6 @@ config I440FX
select IDE_PIIX
select DIMM
select SMBIOS
- select VMMOUSE
select FW_CFG_DMA
config ISAPC
@@ -78,6 +78,7 @@ config Q35
imply AMD_IOMMU
imply E1000E_PCI_EXPRESS
imply VMPORT
+ imply VMMOUSE
select PC_PCI
select PC_ACPI
select PCI_EXPRESS_Q35
@@ -85,7 +86,6 @@ config Q35
select AHCI_ICH9
select DIMM
select SMBIOS
- select VMMOUSE
select FW_CFG_DMA
config VTD
--
2.20.1
We have some flaky tests and usually the test passes on a retry.
Enable travis_retry for the test phase and see if that helps keep
things green.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/.travis.yml b/.travis.yml
index 5d3d6ee1d32..caf0a1f8faf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,7 +75,7 @@ before_script:
- mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
- ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
script:
- - make -j3 && ${TEST_CMD}
+ - make -j3 && travis_retry ${TEST_CMD}
matrix:
--
2.20.1
It's very confusing when things work in the debug shell because the
environment is different from what the test is running. Fix this by
ensuring we only have the inherited environment from the run shell.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/tests/docker/run b/tests/docker/run
index 7aebf4b5698..1014871fec0 100755
--- a/tests/docker/run
+++ b/tests/docker/run
@@ -62,7 +62,7 @@ echo "* Prepared to run command:"
echo " $CMD"
echo "* Hit Ctrl-D to continue, or type 'exit 1' to abort"
echo
-$SHELL
+$SHELL --noprofile --norc
if "$CMD"; then
exit 0
@@ -72,7 +72,7 @@ elif test -n "$DEBUG"; then
echo "* Hit Ctrl-D to exit"
echo
# Force error after shell exits
- $SHELL && exit 1
+ $SHELL --noprofile --norc && exit 1
else
exit 1
fi
--
2.20.1
From: Thomas Huth <thuth@redhat.com>
The regular expressions in the "check" script currently expect that there
is always a space after the test number in the group file, so you can't
have a test in there without a group unless the line still ends with a
space - which is quite error prone since some editors might remove spaces
at the end of lines automatically.
Thus let's fix the regular expressions so that it is also possible to
have lines with one test number only in the group file.
Suggested-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190717111947.30356-2-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index f925606cc52..c24874ff4aa 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -488,7 +488,7 @@ testlist options
BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
| while read id
do
- if grep -s "^$id " "$source_iotests/group" >/dev/null
+ if grep -s "^$id\( \|\$\)" "$source_iotests/group" >/dev/null
then
# in group file ... OK
echo $id >>$tmp.list
@@ -547,7 +547,7 @@ else
touch $tmp.list
else
# no test numbers, do everything from group file
- sed -n -e '/^[0-9][0-9][0-9]*/s/[ ].*//p' <"$source_iotests/group" >$tmp.list
+ sed -n -e '/^[0-9][0-9][0-9]*/s/^\([0-9]*\).*/\1/p' <"$source_iotests/group" >$tmp.list
fi
fi
--
2.20.1
From: Thomas Huth <thuth@redhat.com> Remove some more tests from the "auto" group that either have issues in certain environments (like macOS or FreeBSD, or on certain file systems like ZFS or tmpfs), do not work with the qcow2 format, or that are simply taking too much time. Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <20190717111947.30356-3-thuth@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index b34c8e3c0c6..f13e5f2e234 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -14,7 +14,9 @@ # runnable in any case. That means they should run with every QEMU binary # (also non-x86), with every QEMU configuration (i.e. must not fail if # an optional feature is not compiled in - but reporting a "skip" is ok), -# and work all kind of host filesystems and users (e.g. "nobody" or "root"). +# work at least with the qcow2 file format, work with all kind of host +# filesystems and users (e.g. "nobody" or "root") and must not take too +# much memory and disk space (since CI pipelines tend to fail otherwise). # # @@ -33,8 +35,8 @@ 011 rw auto quick 012 auto quick 013 rw auto -014 rw auto -015 rw snapshot auto +014 rw +015 rw snapshot # 016 was removed, do not reuse 017 rw backing auto quick 018 rw backing auto quick @@ -42,7 +44,7 @@ 020 rw backing auto quick 021 io auto quick 022 rw snapshot auto -023 rw auto +023 rw 024 rw backing auto quick 025 rw auto quick 026 rw blkdbg @@ -78,94 +80,94 @@ 056 rw backing 057 rw 058 rw quick -059 rw auto quick +059 rw quick 060 rw auto quick 061 rw auto 062 rw auto quick 063 rw auto quick -064 rw auto quick +064 rw quick 065 rw quick 066 rw auto quick 067 rw quick 068 rw quick 069 rw auto quick -070 rw auto quick +070 rw quick 071 rw auto quick 072 rw auto quick 073 rw auto quick 074 rw auto quick -075 rw auto quick -076 auto -077 rw auto quick -078 rw auto quick +075 rw quick +076 io +077 rw quick +078 rw quick 079 rw auto 080 rw auto -081 rw auto quick -082 rw auto quick -083 rw auto -084 img auto quick +081 rw quick +082 rw quick +083 rw +084 img quick 085 rw 086 rw auto quick 087 rw quick -088 rw auto quick +088 rw quick 089 rw auto quick 090 rw auto quick -091 rw auto migration -092 rw auto quick +091 rw migration +092 rw quick 093 throttle -094 rw auto quick +094 rw quick 095 rw quick 096 rw quick 097 rw auto backing 098 rw auto backing quick 099 rw auto quick # 100 was removed, do not reuse -101 rw auto quick -102 rw auto quick +101 rw quick +102 rw quick 103 rw auto quick 104 rw auto 105 rw auto quick -106 rw auto quick +106 rw quick 107 rw auto quick 108 rw auto quick -109 rw auto +109 rw 110 rw auto backing quick 111 rw auto quick 112 rw -113 rw auto quick +113 rw quick 114 rw auto quick 115 rw -116 rw auto quick +116 rw quick 117 rw auto 118 rw -119 rw auto quick +119 rw quick 120 rw auto quick 121 rw -122 rw auto -123 rw auto quick +122 rw +123 rw quick 124 rw backing 125 rw 126 rw auto backing 127 rw backing quick -128 rw auto quick +128 rw quick 129 rw quick 130 rw auto quick -131 rw auto quick +131 rw quick 132 rw quick 133 auto quick 134 rw auto quick -135 rw auto +135 rw 136 rw 137 rw auto 138 rw auto quick 139 rw quick 140 rw auto quick 141 rw auto quick -142 auto +142 143 auto quick 144 rw quick 145 quick -146 auto quick +146 quick 147 img 148 rw quick 149 rw sudo @@ -179,23 +181,23 @@ 157 quick 158 rw auto quick 159 rw auto quick -160 rw auto quick +160 rw quick 161 rw auto quick 162 quick 163 rw 165 rw quick 169 rw quick migration 170 rw auto quick -171 rw auto quick +171 rw quick 172 auto -173 rw auto +173 rw 174 auto -175 auto quick +175 quick 176 rw auto backing 177 rw auto quick 178 img 179 rw auto quick -181 rw auto migration +181 rw migration 182 rw quick 183 rw migration 184 rw auto quick @@ -210,62 +212,62 @@ 194 rw migration quick 195 rw auto quick 196 rw quick migration -197 rw auto quick +197 rw quick 198 rw 199 rw migration 200 rw -201 rw auto migration +201 rw migration 202 rw quick 203 rw migration 204 rw quick 205 rw quick 206 rw -207 rw auto +207 rw 208 rw quick 209 rw quick -210 rw auto -211 rw auto quick -212 rw auto quick -213 rw auto quick +210 rw +211 rw quick +212 rw quick +213 rw quick 214 rw auto -215 rw auto quick +215 rw quick 216 rw quick 217 rw auto quick 218 rw quick 219 rw 220 rw auto -221 rw auto quick +221 rw quick 222 rw quick 223 rw quick 224 rw quick -225 rw auto quick +225 rw quick 226 auto quick 227 quick 228 rw quick 229 auto quick -231 auto quick +231 quick 232 quick -233 auto quick +233 quick 234 quick migration 235 quick 236 quick -237 rw auto quick +237 rw quick 238 quick -239 rw auto quick +239 rw quick 240 quick -241 rw auto quick +241 rw quick 242 rw quick -243 rw auto quick +243 rw quick 244 rw auto quick 245 rw 246 rw quick 247 rw quick 248 rw quick 249 rw auto quick -250 rw auto quick +250 rw quick 251 rw auto quick 252 rw auto backing quick -253 rw auto quick -254 rw auto backing quick -255 rw auto quick -256 rw auto quick +253 rw quick +254 rw backing quick +255 rw quick +256 rw quick -- 2.20.1
From: Thomas Huth <thuth@redhat.com>
Since most iotests are now run during "make check" already, we do not
need to test them explicitly from the gitlab-ci.yml script anymore.
And while we're at it, add some of the new non-auto tests >= 246 instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190717111947.30356-5-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c63bf2f8225..cd4c03372b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,15 +45,10 @@ build-tcg-disabled:
- ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033 048
052 063 077 086 101 104 106 113 147 148 150 151 152 157 159 160
163 170 171 183 184 192 194 197 205 208 215 221 222 226 227 236
- - ./check -qcow2 001 002 003 004 005 007 008 009 010 011 012 013 017 018 019
- 020 021 022 024 025 027 028 029 031 032 033 034 035 036 037 038
- 039 040 042 043 046 047 048 049 050 051 052 053 054 056 057 058
- 060 061 062 063 065 066 067 068 069 071 072 073 074 079 080 082
- 085 086 089 090 091 095 096 097 098 099 102 103 104 105 107 108
- 110 111 114 117 120 122 124 126 127 129 130 132 133 134 137 138
- 139 140 141 142 143 144 145 147 150 151 152 154 155 156 157 158
- 161 165 170 172 174 176 177 179 184 186 187 190 192 194 195 196
- 197 200 202 203 205 208 209 214 215 216 217 218 222 226 227 229 234
+ - ./check -qcow2 028 040 051 056 057 058 065 067 068 082 085 091 095 096 102
+ 122 124 127 129 132 139 142 144 145 147 151 152 155 157 165 194
+ 196 197 200 202 203 205 208 209 215 216 218 222 227 234 246 247
+ 248 250 254 255 256
build-user:
script:
--
2.20.1
© 2016 - 2024 Red Hat, Inc.