| Message ID | 20200206211936.17098-1-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
From: Paolo Bonzini <pbonzini@redhat.com> Scripts that have a Python shebang are meant to be executed directly from the shell; give them 755 permissions. Cc: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20200204160237.16889-1-pbonzini@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- scripts/minikconf.py | 0 scripts/signrom.py | 0 tests/qemu-iotests/222 | 0 tests/qemu-iotests/245 | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/minikconf.py mode change 100644 => 100755 scripts/signrom.py mode change 100644 => 100755 tests/qemu-iotests/222 mode change 100644 => 100755 tests/qemu-iotests/245 diff --git a/scripts/minikconf.py b/scripts/minikconf.py old mode 100644 new mode 100755 diff --git a/scripts/signrom.py b/scripts/signrom.py old mode 100644 new mode 100755 diff --git a/tests/qemu-iotests/222 b/tests/qemu-iotests/222 old mode 100644 new mode 100755 diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245 old mode 100644 new mode 100755
On Thu, Feb 06, 2020 at 10:18:50PM +0100, Philippe Mathieu-Daudé wrote: > Hi Peter, > > I prepared this series on behalf of Eduardo and > Cleber (one of them will ack this cover). Acked-by: Eduardo Habkost <ehabkost@redhat.com> > > Regards, > > Phil. > > The following changes since commit 418fa86dd465b4fd8394373cf83db8fa65d7611c: > > Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-040220-1' into staging (2020-02-04 18:55:06 +0000) > > are available in the Git repository at: > > https://gitlab.com/philmd/qemu.git tags/python-next-20200206 > > for you to fetch changes up to 3e3481a5df933a26b47f08e5913821672d28d308: > > .readthedocs.yml: specify some minimum python requirements (2020-02-06 21:48:24 +0100) > > ---------------------------------------------------------------- > > - Python 3 cleanups: > . Remove text about Python 2 in qemu-deprecated (Thomas) > . Remove shebang header (Paolo, Philippe) > . scripts/checkpatch.pl now allows Python 3 interpreter (Philippe) > . Explicit usage of Python 3 interpreter in scripts (Philippe) > . Fix Python scripts permissions (Paolo, Philippe) > . Drop 'from __future__ import print_function' (Paolo) > . Specify minimum python requirements in ReadTheDocs configuration (Alex) > - Test UNIX/EXEC transports with migration (Oksana) > - Added extract_from_rpm helper, improved extract_from_deb (Liam) > - Allow to use other serial consoles than default one (Philippe) > - Various improvements in QEMUMonitorProtocol (Wainer) > - Fix kvm_available() on ppc64le (Wainer) > > ---------------------------------------------------------------- > > Alex Bennée (1): > .readthedocs.yml: specify some minimum python requirements > > Denis Plotnikov (1): > tests: rename virtio_seg_max_adjust to virtio_check_params > > Liam Merwick (4): > travis.yml: install rpm2cpio for acceptance tests > tests/boot_linux_console: add extract_from_rpm method > tests/boot_linux_console: use os.path for filesystem paths > tests/boot_linux_console: fix extract_from_deb() comment > > Lukáš Doktor (1): > python: Treat None-return of greeting cmd > > Oksana Vohchana (4): > tests/acceptance/migration: Factor out assert_migration() > tests/acceptance/migration: Factor out do_migrate() > tests/acceptance/migration: Test UNIX transport when migrating > tests/acceptance/migration: Test EXEC transport when migrating > > Paolo Bonzini (3): > scripts/signrom: remove Python 2 support, add shebang > make all Python scripts executable > drop "from __future__ import print_function" > > Philippe Mathieu-Daudé (24): > python/qemu/machine: Allow to use other serial consoles than default > Acceptance tests: Extract _console_interaction() > Acceptance tests: Add interrupt_interactive_console_until_pattern() > tests/boot_linux_console: Tag Emcraft Smartfusion2 as running 'u-boot' > tests/acceptance/virtio_check_params: Improve exception logging > tests/acceptance/virtio_check_params: List machine being tested > tests/acceptance/virtio_check_params: Default to -nodefaults > tests/acceptance/virtio_check_params: Disable the test > tests/acceptance/boot_linux_console: Do not use VGA on Clipper machine > tests/acceptance/version: Default to -nodefaults > tests/acceptance/migration: Add the 'migration' tag > tests/acceptance/migration: Default to -nodefaults > scripts/checkpatch.pl: Only allow Python 3 interpreter > tests/qemu-iotests/check: Allow use of python3 interpreter > tests/qemu-iotests: Explicit usage of Python 3 (scripts with __main__) > tests: Explicit usage of Python 3 > scripts: Explicit usage of Python 3 (scripts with __main__) > scripts/minikconf: Explicit usage of Python 3 > scripts/tracetool: Remove shebang header > tests/acceptance: Remove shebang header > tests/vm: Remove shebang header > tests/qemu-iotests: Explicit usage of Python3 (scripts without > __main__) > scripts: Explicit usage of Python 3 (scripts without __main__) > tests/qemu-iotests/check: Only check for Python 3 interpreter > > Thomas Huth (2): > qemu-deprecated: Remove text about Python 2 > tests/acceptance: Add boot tests for some of the QEMU advent calendar > images > > Wainer dos Santos Moschetta (6): > python/qemu: qmp: Replace socket.error with OSError > python/qemu: Delint the qmp module > python/qemu: qmp: Make accept()'s timeout configurable > python/qemu: qmp: Make QEMUMonitorProtocol a context manager > python/qemu: qmp: Remove unnused attributes > python/qemu: accel: Fix kvm_available() on ppc64le > > qemu-deprecated.texi | 8 -- > .readthedocs.yml | 20 +++ > .travis.yml | 3 +- > python/qemu/accel.py | 3 +- > python/qemu/machine.py | 10 +- > python/qemu/qmp.py | 99 ++++++++++---- > scripts/analyse-9p-simpletrace.py | 3 +- > scripts/analyse-locks-simpletrace.py | 3 +- > scripts/checkpatch.pl | 6 + > scripts/decodetree.py | 2 +- > scripts/device-crash-test | 3 +- > scripts/dump-guest-memory.py | 1 - > scripts/kvm/kvm_flightrecorder | 3 +- > scripts/kvm/vmxcap | 1 - > scripts/minikconf.py | 2 +- > scripts/modules/module_block.py | 1 - > scripts/qapi-gen.py | 3 +- > scripts/qapi/doc.py | 1 - > scripts/qmp/qemu-ga-client | 3 +- > scripts/qmp/qmp | 3 +- > scripts/qmp/qmp-shell | 3 +- > scripts/qmp/qom-fuse | 2 +- > scripts/qmp/qom-get | 1 - > scripts/qmp/qom-list | 1 - > scripts/qmp/qom-set | 1 - > scripts/qmp/qom-tree | 1 - > scripts/render_block_graph.py | 2 +- > scripts/replay-dump.py | 3 +- > scripts/signrom.py | 11 +- > scripts/simpletrace.py | 3 +- > scripts/tracetool.py | 2 +- > scripts/tracetool/__init__.py | 1 - > scripts/tracetool/backend/__init__.py | 1 - > scripts/tracetool/backend/dtrace.py | 1 - > scripts/tracetool/backend/ftrace.py | 1 - > scripts/tracetool/backend/log.py | 1 - > scripts/tracetool/backend/simple.py | 1 - > scripts/tracetool/backend/syslog.py | 1 - > scripts/tracetool/backend/ust.py | 1 - > scripts/tracetool/format/__init__.py | 1 - > scripts/tracetool/format/c.py | 1 - > scripts/tracetool/format/d.py | 1 - > scripts/tracetool/format/h.py | 1 - > scripts/tracetool/format/log_stap.py | 1 - > scripts/tracetool/format/simpletrace_stap.py | 1 - > scripts/tracetool/format/stap.py | 1 - > scripts/tracetool/format/tcg_h.py | 1 - > scripts/tracetool/format/tcg_helper_c.py | 1 - > scripts/tracetool/format/tcg_helper_h.py | 1 - > .../tracetool/format/tcg_helper_wrapper_h.py | 1 - > scripts/tracetool/format/ust_events_c.py | 1 - > scripts/tracetool/format/ust_events_h.py | 1 - > scripts/tracetool/transform.py | 1 - > scripts/tracetool/vcpu.py | 1 - > scripts/vmstate-static-checker.py | 3 +- > tests/acceptance/avocado_qemu/__init__.py | 59 +++++++-- > tests/acceptance/boot_linux_console.py | 124 +++++++++++++++++- > tests/acceptance/migration.py | 57 +++++--- > tests/acceptance/version.py | 1 + > ...g_max_adjust.py => virtio_check_params.py} | 16 ++- > tests/acceptance/x86_cpu_model_versions.py | 1 - > tests/docker/travis.py | 3 +- > tests/guest-debug/test-gdbstub.py | 1 - > tests/migration/guestperf/engine.py | 1 - > tests/migration/guestperf/plot.py | 1 - > tests/migration/guestperf/shell.py | 1 - > tests/qapi-schema/test-qapi.py | 3 +- > tests/qemu-iotests/030 | 2 +- > tests/qemu-iotests/040 | 2 +- > tests/qemu-iotests/041 | 2 +- > tests/qemu-iotests/044 | 2 +- > tests/qemu-iotests/045 | 2 +- > tests/qemu-iotests/055 | 2 +- > tests/qemu-iotests/056 | 2 +- > tests/qemu-iotests/057 | 2 +- > tests/qemu-iotests/065 | 2 +- > tests/qemu-iotests/093 | 2 +- > tests/qemu-iotests/096 | 2 +- > tests/qemu-iotests/118 | 2 +- > tests/qemu-iotests/124 | 2 +- > tests/qemu-iotests/129 | 2 +- > tests/qemu-iotests/132 | 2 +- > tests/qemu-iotests/136 | 2 +- > tests/qemu-iotests/139 | 2 +- > tests/qemu-iotests/147 | 2 +- > tests/qemu-iotests/148 | 2 +- > tests/qemu-iotests/149 | 3 +- > tests/qemu-iotests/151 | 2 +- > tests/qemu-iotests/152 | 2 +- > tests/qemu-iotests/155 | 2 +- > tests/qemu-iotests/163 | 2 +- > tests/qemu-iotests/165 | 3 +- > tests/qemu-iotests/169 | 2 +- > tests/qemu-iotests/194 | 2 +- > tests/qemu-iotests/196 | 2 +- > tests/qemu-iotests/199 | 2 +- > tests/qemu-iotests/202 | 2 +- > tests/qemu-iotests/203 | 2 +- > tests/qemu-iotests/205 | 2 +- > tests/qemu-iotests/206 | 2 +- > tests/qemu-iotests/207 | 2 +- > tests/qemu-iotests/208 | 2 +- > tests/qemu-iotests/209 | 2 +- > tests/qemu-iotests/210 | 2 +- > tests/qemu-iotests/211 | 2 +- > tests/qemu-iotests/212 | 2 +- > tests/qemu-iotests/213 | 2 +- > tests/qemu-iotests/216 | 2 +- > tests/qemu-iotests/218 | 2 +- > tests/qemu-iotests/219 | 2 +- > tests/qemu-iotests/222 | 2 +- > tests/qemu-iotests/224 | 2 +- > tests/qemu-iotests/228 | 2 +- > tests/qemu-iotests/234 | 2 +- > tests/qemu-iotests/235 | 2 +- > tests/qemu-iotests/236 | 2 +- > tests/qemu-iotests/237 | 2 +- > tests/qemu-iotests/238 | 2 +- > tests/qemu-iotests/242 | 2 +- > tests/qemu-iotests/245 | 2 +- > tests/qemu-iotests/246 | 2 +- > tests/qemu-iotests/248 | 2 +- > tests/qemu-iotests/254 | 2 +- > tests/qemu-iotests/255 | 2 +- > tests/qemu-iotests/256 | 2 +- > tests/qemu-iotests/257 | 2 +- > tests/qemu-iotests/258 | 2 +- > tests/qemu-iotests/260 | 2 +- > tests/qemu-iotests/262 | 2 +- > tests/qemu-iotests/264 | 2 +- > tests/qemu-iotests/266 | 2 +- > tests/qemu-iotests/277 | 2 +- > tests/qemu-iotests/280 | 2 +- > tests/qemu-iotests/281 | 2 +- > tests/qemu-iotests/check | 2 +- > tests/qemu-iotests/iotests.py | 1 - > tests/qemu-iotests/nbd-fault-injector.py | 3 +- > tests/qemu-iotests/qcow2.py | 3 +- > tests/qemu-iotests/qed.py | 3 +- > tests/vm/basevm.py | 2 - > tests/vm/centos | 2 +- > tests/vm/fedora | 2 +- > tests/vm/freebsd | 2 +- > tests/vm/netbsd | 2 +- > tests/vm/openbsd | 2 +- > tests/vm/ubuntu.i386 | 2 +- > 146 files changed, 431 insertions(+), 233 deletions(-) > create mode 100644 .readthedocs.yml > mode change 100644 => 100755 scripts/minikconf.py > mode change 100644 => 100755 scripts/signrom.py > rename tests/acceptance/{virtio_seg_max_adjust.py => virtio_check_params.py} (90%) > mode change 100755 => 100644 > mode change 100644 => 100755 tests/qemu-iotests/222 > mode change 100644 => 100755 tests/qemu-iotests/245 > mode change 100755 => 100644 tests/vm/basevm.py > > -- > 2.21.1 >
On Thu, 6 Feb 2020 at 21:21, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > Hi Peter, > > I prepared this series on behalf of Eduardo and > Cleber (one of them will ack this cover). > > Regards, > > Phil. > > The following changes since commit 418fa86dd465b4fd8394373cf83db8fa65d7611c: > > Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-040220-1' into staging (2020-02-04 18:55:06 +0000) > > are available in the Git repository at: > > https://gitlab.com/philmd/qemu.git tags/python-next-20200206 > > for you to fetch changes up to 3e3481a5df933a26b47f08e5913821672d28d308: > > .readthedocs.yml: specify some minimum python requirements (2020-02-06 21:48:24 +0100) Hi; this fails 'make check' (all hosts): TEST iotest-qcow2: 252 TEST iotest-qcow2: 256 TEST iotest-qcow2: 265 TEST iotest-qcow2: 267 TEST iotest-qcow2: 268 TEST iotest-qcow2: 283 [fail] QEMU -- "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64" -nodefaults -display none -accel qtest QEMU_IMG -- "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-img" QEMU_IO -- "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-io" --cache writeback --aio threads -f qcow2 QEMU_NBD -- "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-nbd" IMGFMT -- qcow2 (compat=1.1) IMGPROTO -- file PLATFORM -- Linux/x86_64 e104462 4.15.0-74-generic TEST_DIR -- /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/scratch SOCK_DIR -- /tmp/tmp.oppAzNNHIY SOCKET_SCM_HELPER -- /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/socket_scm_helper --- /home/petmay01/linaro/qemu-for-merges/tests/qemu-iotests/283.out 2020-02-06 18:59:06.291529139 +0000 +++ /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/283.out.bad 2020-02-07 11:25:38.477373907 +0000 @@ -1,8 +1 @@ -{"execute": "blockdev-add", "arguments": {"driver": "null-co", "node-name": "target"}} -{"return": {}} -{"execute": "blockdev-add", "arguments": {"driver": "blkdebug", "image": {"driver": "null-co", "node-name": "base", "size": 1048576}, "node-name": "source"}} -{"return": {}} -{"execute": "blockdev-add", "arguments": {"driver": "blkdebug", "image": "base", "node-name": "other", "take-child-perms": ["write"]}} -{"return": {}} -{"execute": "blockdev-backup", "arguments": {"device": "source", "sync": "full", "target": "target"}} -{"error": {"class": "GenericError", "desc": "Cannot set permissions for backup-top filter: Conflicts with use by other as 'image', which uses 'write' on base"}} +./check: line 866: ./283: Permission denied Not run: 220 Failures: 283 Failed 1 of 115 iotests /home/petmay01/linaro/qemu-for-merges/tests/Makefile.include:842: recipe for target 'check-tests/check-block.sh' failed thanks -- PMM
On 2/7/20 12:51 PM, Peter Maydell wrote: > On Thu, 6 Feb 2020 at 21:21, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: >> >> Hi Peter, >> >> I prepared this series on behalf of Eduardo and >> Cleber (one of them will ack this cover). >> >> Regards, >> >> Phil. >> >> The following changes since commit 418fa86dd465b4fd8394373cf83db8fa65d7611c: >> >> Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-040220-1' into staging (2020-02-04 18:55:06 +0000) >> >> are available in the Git repository at: >> >> https://gitlab.com/philmd/qemu.git tags/python-next-20200206 >> >> for you to fetch changes up to 3e3481a5df933a26b47f08e5913821672d28d308: >> >> .readthedocs.yml: specify some minimum python requirements (2020-02-06 21:48:24 +0100) > > Hi; this fails 'make check' (all hosts): > > TEST iotest-qcow2: 252 > TEST iotest-qcow2: 256 > TEST iotest-qcow2: 265 > TEST iotest-qcow2: 267 > TEST iotest-qcow2: 268 > TEST iotest-qcow2: 283 [fail] > QEMU -- > "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64" > -nodefaults -display none -accel qtest > QEMU_IMG -- > "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-img" > QEMU_IO -- > "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-io" > --cache writeback --aio threads -f qcow2 > QEMU_NBD -- > "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-nbd" > IMGFMT -- qcow2 (compat=1.1) > IMGPROTO -- file > PLATFORM -- Linux/x86_64 e104462 4.15.0-74-generic > TEST_DIR -- > /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/scratch > SOCK_DIR -- /tmp/tmp.oppAzNNHIY > SOCKET_SCM_HELPER -- > /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/socket_scm_helper > > --- /home/petmay01/linaro/qemu-for-merges/tests/qemu-iotests/283.out > 2020-02-06 18:59:06.291529139 +0000 > +++ /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/283.out.bad > 2020-02-07 11:25:38.477373907 +0000 > @@ -1,8 +1 @@ > -{"execute": "blockdev-add", "arguments": {"driver": "null-co", > "node-name": "target"}} > -{"return": {}} > -{"execute": "blockdev-add", "arguments": {"driver": "blkdebug", > "image": {"driver": "null-co", "node-name": "base", "size": 1048576}, > "node-name": "source"}} > -{"return": {}} > -{"execute": "blockdev-add", "arguments": {"driver": "blkdebug", > "image": "base", "node-name": "other", "take-child-perms": ["write"]}} > -{"return": {}} > -{"execute": "blockdev-backup", "arguments": {"device": "source", > "sync": "full", "target": "target"}} > -{"error": {"class": "GenericError", "desc": "Cannot set permissions > for backup-top filter: Conflicts with use by other as 'image', which > uses 'write' on base"}} > +./check: line 866: ./283: Permission denied > Not run: 220 > Failures: 283 Interesting. I apologize this test is not in my suite. > Failed 1 of 115 iotests > /home/petmay01/linaro/qemu-for-merges/tests/Makefile.include:842: > recipe for target 'check-tests/check-block.sh' failed
Cc'ing qemu-block@ On 2/7/20 12:51 PM, Peter Maydell wrote: > On Thu, 6 Feb 2020 at 21:21, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: >> >> Hi Peter, >> >> I prepared this series on behalf of Eduardo and >> Cleber (one of them will ack this cover). >> >> Regards, >> >> Phil. >> >> The following changes since commit 418fa86dd465b4fd8394373cf83db8fa65d7611c: >> >> Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-040220-1' into staging (2020-02-04 18:55:06 +0000) >> >> are available in the Git repository at: >> >> https://gitlab.com/philmd/qemu.git tags/python-next-20200206 >> >> for you to fetch changes up to 3e3481a5df933a26b47f08e5913821672d28d308: >> >> .readthedocs.yml: specify some minimum python requirements (2020-02-06 21:48:24 +0100) > > Hi; this fails 'make check' (all hosts): > > TEST iotest-qcow2: 252 > TEST iotest-qcow2: 256 > TEST iotest-qcow2: 265 > TEST iotest-qcow2: 267 > TEST iotest-qcow2: 268 > TEST iotest-qcow2: 283 [fail] > QEMU -- > "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64" > -nodefaults -display none -accel qtest > QEMU_IMG -- > "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-img" > QEMU_IO -- > "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-io" > --cache writeback --aio threads -f qcow2 > QEMU_NBD -- > "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-nbd" > IMGFMT -- qcow2 (compat=1.1) > IMGPROTO -- file > PLATFORM -- Linux/x86_64 e104462 4.15.0-74-generic > TEST_DIR -- > /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/scratch > SOCK_DIR -- /tmp/tmp.oppAzNNHIY > SOCKET_SCM_HELPER -- > /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/socket_scm_helper > > --- /home/petmay01/linaro/qemu-for-merges/tests/qemu-iotests/283.out > 2020-02-06 18:59:06.291529139 +0000 > +++ /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/283.out.bad > 2020-02-07 11:25:38.477373907 +0000 > @@ -1,8 +1 @@ > -{"execute": "blockdev-add", "arguments": {"driver": "null-co", > "node-name": "target"}} > -{"return": {}} > -{"execute": "blockdev-add", "arguments": {"driver": "blkdebug", > "image": {"driver": "null-co", "node-name": "base", "size": 1048576}, > "node-name": "source"}} > -{"return": {}} > -{"execute": "blockdev-add", "arguments": {"driver": "blkdebug", > "image": "base", "node-name": "other", "take-child-perms": ["write"]}} > -{"return": {}} > -{"execute": "blockdev-backup", "arguments": {"device": "source", > "sync": "full", "target": "target"}} > -{"error": {"class": "GenericError", "desc": "Cannot set permissions > for backup-top filter: Conflicts with use by other as 'image', which > uses 'write' on base"}} > +./check: line 866: ./283: Permission denied > Not run: 220 > Failures: 283 > Failed 1 of 115 iotests > /home/petmay01/linaro/qemu-for-merges/tests/Makefile.include:842: > recipe for target 'check-tests/check-block.sh' failed I only run out-of-tree builds. I noticed the block tests were not run until I add this change: -- >8 -- --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -836,7 +836,7 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF) .PHONY: check-tests/check-block.sh -check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \ +check-tests/check-block.sh: $(SRC_PATH)/tests/check-block.sh qemu-img$(EXESUF) \ qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \ $(patsubst %,%/all,$(filter %-softmmu,$(TARGET_DIRS))) @$< --- Peter, are you running only in-tree builds?
On Fri, Feb 7, 2020 at 2:30 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > Cc'ing qemu-block@ > > On 2/7/20 12:51 PM, Peter Maydell wrote: > > On Thu, 6 Feb 2020 at 21:21, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > >> > >> Hi Peter, > >> > >> I prepared this series on behalf of Eduardo and > >> Cleber (one of them will ack this cover). > >> > >> Regards, > >> > >> Phil. > >> > >> The following changes since commit 418fa86dd465b4fd8394373cf83db8fa65d7611c: > >> > >> Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-040220-1' into staging (2020-02-04 18:55:06 +0000) > >> > >> are available in the Git repository at: > >> > >> https://gitlab.com/philmd/qemu.git tags/python-next-20200206 > >> > >> for you to fetch changes up to 3e3481a5df933a26b47f08e5913821672d28d308: > >> > >> .readthedocs.yml: specify some minimum python requirements (2020-02-06 21:48:24 +0100) > > > > Hi; this fails 'make check' (all hosts): > > > > TEST iotest-qcow2: 252 > > TEST iotest-qcow2: 256 > > TEST iotest-qcow2: 265 > > TEST iotest-qcow2: 267 > > TEST iotest-qcow2: 268 > > TEST iotest-qcow2: 283 [fail] > > QEMU -- > > "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64" > > -nodefaults -display none -accel qtest > > QEMU_IMG -- > > "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-img" > > QEMU_IO -- > > "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-io" > > --cache writeback --aio threads -f qcow2 > > QEMU_NBD -- > > "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-nbd" > > IMGFMT -- qcow2 (compat=1.1) > > IMGPROTO -- file > > PLATFORM -- Linux/x86_64 e104462 4.15.0-74-generic > > TEST_DIR -- > > /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/scratch > > SOCK_DIR -- /tmp/tmp.oppAzNNHIY > > SOCKET_SCM_HELPER -- > > /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/socket_scm_helper > > > > --- /home/petmay01/linaro/qemu-for-merges/tests/qemu-iotests/283.out > > 2020-02-06 18:59:06.291529139 +0000 > > +++ /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/283.out.bad > > 2020-02-07 11:25:38.477373907 +0000 > > @@ -1,8 +1 @@ > > -{"execute": "blockdev-add", "arguments": {"driver": "null-co", > > "node-name": "target"}} > > -{"return": {}} > > -{"execute": "blockdev-add", "arguments": {"driver": "blkdebug", > > "image": {"driver": "null-co", "node-name": "base", "size": 1048576}, > > "node-name": "source"}} > > -{"return": {}} > > -{"execute": "blockdev-add", "arguments": {"driver": "blkdebug", > > "image": "base", "node-name": "other", "take-child-perms": ["write"]}} > > -{"return": {}} > > -{"execute": "blockdev-backup", "arguments": {"device": "source", > > "sync": "full", "target": "target"}} > > -{"error": {"class": "GenericError", "desc": "Cannot set permissions > > for backup-top filter: Conflicts with use by other as 'image', which > > uses 'write' on base"}} > > +./check: line 866: ./283: Permission denied > > Not run: 220 > > Failures: 283 > > Failed 1 of 115 iotests > > /home/petmay01/linaro/qemu-for-merges/tests/Makefile.include:842: > > recipe for target 'check-tests/check-block.sh' failed > > I only run out-of-tree builds. > > I noticed the block tests were not run until I add this change: > > -- >8 -- > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -836,7 +836,7 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) > QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = > tests/qemu-iotests/socket_scm_helper$(EXESUF) > > .PHONY: check-tests/check-block.sh > -check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \ > +check-tests/check-block.sh: $(SRC_PATH)/tests/check-block.sh > qemu-img$(EXESUF) \ > qemu-io$(EXESUF) qemu-nbd$(EXESUF) > $(QEMU_IOTESTS_HELPERS-y) \ > $(patsubst %,%/all,$(filter %-softmmu,$(TARGET_DIRS))) > @$< > --- > > Peter, are you running only in-tree builds? Oops nevermind, I was in a '--disable-tools' build directory when I restarted testing.
On 2/7/20 1:39 PM, Philippe Mathieu-Daudé wrote: > On 2/7/20 12:51 PM, Peter Maydell wrote: >> On Thu, 6 Feb 2020 at 21:21, Philippe Mathieu-Daudé >> <philmd@redhat.com> wrote: >>> >>> Hi Peter, >>> >>> I prepared this series on behalf of Eduardo and >>> Cleber (one of them will ack this cover). >>> >>> Regards, >>> >>> Phil. >>> >>> The following changes since commit >>> 418fa86dd465b4fd8394373cf83db8fa65d7611c: >>> >>> Merge remote-tracking branch >>> 'remotes/stsquad/tags/pull-testing-040220-1' into staging (2020-02-04 >>> 18:55:06 +0000) >>> >>> are available in the Git repository at: >>> >>> https://gitlab.com/philmd/qemu.git tags/python-next-20200206 >>> >>> for you to fetch changes up to 3e3481a5df933a26b47f08e5913821672d28d308: >>> >>> .readthedocs.yml: specify some minimum python requirements >>> (2020-02-06 21:48:24 +0100) >> >> Hi; this fails 'make check' (all hosts): >> >> TEST iotest-qcow2: 252 >> TEST iotest-qcow2: 256 >> TEST iotest-qcow2: 265 >> TEST iotest-qcow2: 267 >> TEST iotest-qcow2: 268 >> TEST iotest-qcow2: 283 [fail] >> QEMU -- >> "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64" >> >> -nodefaults -display none -accel qtest >> QEMU_IMG -- >> "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-img" >> >> QEMU_IO -- >> "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-io" >> >> --cache writeback --aio threads -f qcow2 >> QEMU_NBD -- >> "/home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/../../qemu-nbd" >> >> IMGFMT -- qcow2 (compat=1.1) >> IMGPROTO -- file >> PLATFORM -- Linux/x86_64 e104462 4.15.0-74-generic >> TEST_DIR -- >> /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/scratch >> >> SOCK_DIR -- /tmp/tmp.oppAzNNHIY >> SOCKET_SCM_HELPER -- >> /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/socket_scm_helper >> >> >> --- /home/petmay01/linaro/qemu-for-merges/tests/qemu-iotests/283.out >> 2020-02-06 18:59:06.291529139 +0000 >> +++ >> /home/petmay01/linaro/qemu-for-merges/build/all/tests/qemu-iotests/283.out.bad >> >> 2020-02-07 11:25:38.477373907 +0000 >> @@ -1,8 +1 @@ >> -{"execute": "blockdev-add", "arguments": {"driver": "null-co", >> "node-name": "target"}} >> -{"return": {}} >> -{"execute": "blockdev-add", "arguments": {"driver": "blkdebug", >> "image": {"driver": "null-co", "node-name": "base", "size": 1048576}, >> "node-name": "source"}} >> -{"return": {}} >> -{"execute": "blockdev-add", "arguments": {"driver": "blkdebug", >> "image": "base", "node-name": "other", "take-child-perms": ["write"]}} >> -{"return": {}} >> -{"execute": "blockdev-backup", "arguments": {"device": "source", >> "sync": "full", "target": "target"}} >> -{"error": {"class": "GenericError", "desc": "Cannot set permissions >> for backup-top filter: Conflicts with use by other as 'image', which >> uses 'write' on base"}} >> +./check: line 866: ./283: Permission denied >> Not run: 220 >> Failures: 283 > > Interesting. > I apologize this test is not in my suite. Actually test 283 was merged yesterday few hours before I send this pull request (which is why it passed the new checkpatch test), and it doesn't use the Python 3 interpreter after shebang. Once updated to Python 3, with this hunk, the test pass: -- >8 -- --- a/tests/qemu-iotests/283 +++ b/tests/qemu-iotests/283 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Test for backup-top filter permission activation failure # --- ... TEST iotest-qcow2: 244 TEST iotest-qcow2: 249 TEST iotest-qcow2: 251 TEST iotest-qcow2: 252 TEST iotest-qcow2: 256 TEST iotest-qcow2: 265 TEST iotest-qcow2: 267 TEST iotest-qcow2: 268 TEST iotest-qcow2: 283 Not run: 220 Passed all 115 iotests I'll rebase and respin. > >> Failed 1 of 115 iotests >> /home/petmay01/linaro/qemu-for-merges/tests/Makefile.include:842: >> recipe for target 'check-tests/check-block.sh' failed
Hi Peter, I prepared this series on behalf of Eduardo and Cleber (one of them will ack this cover). Regards, Phil. The following changes since commit 418fa86dd465b4fd8394373cf83db8fa65d7611c: Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-040220-1' into staging (2020-02-04 18:55:06 +0000) are available in the Git repository at: https://gitlab.com/philmd/qemu.git tags/python-next-20200206 for you to fetch changes up to 3e3481a5df933a26b47f08e5913821672d28d308: .readthedocs.yml: specify some minimum python requirements (2020-02-06 21:48:24 +0100) ---------------------------------------------------------------- - Python 3 cleanups: . Remove text about Python 2 in qemu-deprecated (Thomas) . Remove shebang header (Paolo, Philippe) . scripts/checkpatch.pl now allows Python 3 interpreter (Philippe) . Explicit usage of Python 3 interpreter in scripts (Philippe) . Fix Python scripts permissions (Paolo, Philippe) . Drop 'from __future__ import print_function' (Paolo) . Specify minimum python requirements in ReadTheDocs configuration (Alex) - Test UNIX/EXEC transports with migration (Oksana) - Added extract_from_rpm helper, improved extract_from_deb (Liam) - Allow to use other serial consoles than default one (Philippe) - Various improvements in QEMUMonitorProtocol (Wainer) - Fix kvm_available() on ppc64le (Wainer) ---------------------------------------------------------------- Alex Bennée (1): .readthedocs.yml: specify some minimum python requirements Denis Plotnikov (1): tests: rename virtio_seg_max_adjust to virtio_check_params Liam Merwick (4): travis.yml: install rpm2cpio for acceptance tests tests/boot_linux_console: add extract_from_rpm method tests/boot_linux_console: use os.path for filesystem paths tests/boot_linux_console: fix extract_from_deb() comment Lukáš Doktor (1): python: Treat None-return of greeting cmd Oksana Vohchana (4): tests/acceptance/migration: Factor out assert_migration() tests/acceptance/migration: Factor out do_migrate() tests/acceptance/migration: Test UNIX transport when migrating tests/acceptance/migration: Test EXEC transport when migrating Paolo Bonzini (3): scripts/signrom: remove Python 2 support, add shebang make all Python scripts executable drop "from __future__ import print_function" Philippe Mathieu-Daudé (24): python/qemu/machine: Allow to use other serial consoles than default Acceptance tests: Extract _console_interaction() Acceptance tests: Add interrupt_interactive_console_until_pattern() tests/boot_linux_console: Tag Emcraft Smartfusion2 as running 'u-boot' tests/acceptance/virtio_check_params: Improve exception logging tests/acceptance/virtio_check_params: List machine being tested tests/acceptance/virtio_check_params: Default to -nodefaults tests/acceptance/virtio_check_params: Disable the test tests/acceptance/boot_linux_console: Do not use VGA on Clipper machine tests/acceptance/version: Default to -nodefaults tests/acceptance/migration: Add the 'migration' tag tests/acceptance/migration: Default to -nodefaults scripts/checkpatch.pl: Only allow Python 3 interpreter tests/qemu-iotests/check: Allow use of python3 interpreter tests/qemu-iotests: Explicit usage of Python 3 (scripts with __main__) tests: Explicit usage of Python 3 scripts: Explicit usage of Python 3 (scripts with __main__) scripts/minikconf: Explicit usage of Python 3 scripts/tracetool: Remove shebang header tests/acceptance: Remove shebang header tests/vm: Remove shebang header tests/qemu-iotests: Explicit usage of Python3 (scripts without __main__) scripts: Explicit usage of Python 3 (scripts without __main__) tests/qemu-iotests/check: Only check for Python 3 interpreter Thomas Huth (2): qemu-deprecated: Remove text about Python 2 tests/acceptance: Add boot tests for some of the QEMU advent calendar images Wainer dos Santos Moschetta (6): python/qemu: qmp: Replace socket.error with OSError python/qemu: Delint the qmp module python/qemu: qmp: Make accept()'s timeout configurable python/qemu: qmp: Make QEMUMonitorProtocol a context manager python/qemu: qmp: Remove unnused attributes python/qemu: accel: Fix kvm_available() on ppc64le qemu-deprecated.texi | 8 -- .readthedocs.yml | 20 +++ .travis.yml | 3 +- python/qemu/accel.py | 3 +- python/qemu/machine.py | 10 +- python/qemu/qmp.py | 99 ++++++++++---- scripts/analyse-9p-simpletrace.py | 3 +- scripts/analyse-locks-simpletrace.py | 3 +- scripts/checkpatch.pl | 6 + scripts/decodetree.py | 2 +- scripts/device-crash-test | 3 +- scripts/dump-guest-memory.py | 1 - scripts/kvm/kvm_flightrecorder | 3 +- scripts/kvm/vmxcap | 1 - scripts/minikconf.py | 2 +- scripts/modules/module_block.py | 1 - scripts/qapi-gen.py | 3 +- scripts/qapi/doc.py | 1 - scripts/qmp/qemu-ga-client | 3 +- scripts/qmp/qmp | 3 +- scripts/qmp/qmp-shell | 3 +- scripts/qmp/qom-fuse | 2 +- scripts/qmp/qom-get | 1 - scripts/qmp/qom-list | 1 - scripts/qmp/qom-set | 1 - scripts/qmp/qom-tree | 1 - scripts/render_block_graph.py | 2 +- scripts/replay-dump.py | 3 +- scripts/signrom.py | 11 +- scripts/simpletrace.py | 3 +- scripts/tracetool.py | 2 +- scripts/tracetool/__init__.py | 1 - scripts/tracetool/backend/__init__.py | 1 - scripts/tracetool/backend/dtrace.py | 1 - scripts/tracetool/backend/ftrace.py | 1 - scripts/tracetool/backend/log.py | 1 - scripts/tracetool/backend/simple.py | 1 - scripts/tracetool/backend/syslog.py | 1 - scripts/tracetool/backend/ust.py | 1 - scripts/tracetool/format/__init__.py | 1 - scripts/tracetool/format/c.py | 1 - scripts/tracetool/format/d.py | 1 - scripts/tracetool/format/h.py | 1 - scripts/tracetool/format/log_stap.py | 1 - scripts/tracetool/format/simpletrace_stap.py | 1 - scripts/tracetool/format/stap.py | 1 - scripts/tracetool/format/tcg_h.py | 1 - scripts/tracetool/format/tcg_helper_c.py | 1 - scripts/tracetool/format/tcg_helper_h.py | 1 - .../tracetool/format/tcg_helper_wrapper_h.py | 1 - scripts/tracetool/format/ust_events_c.py | 1 - scripts/tracetool/format/ust_events_h.py | 1 - scripts/tracetool/transform.py | 1 - scripts/tracetool/vcpu.py | 1 - scripts/vmstate-static-checker.py | 3 +- tests/acceptance/avocado_qemu/__init__.py | 59 +++++++-- tests/acceptance/boot_linux_console.py | 124 +++++++++++++++++- tests/acceptance/migration.py | 57 +++++--- tests/acceptance/version.py | 1 + ...g_max_adjust.py => virtio_check_params.py} | 16 ++- tests/acceptance/x86_cpu_model_versions.py | 1 - tests/docker/travis.py | 3 +- tests/guest-debug/test-gdbstub.py | 1 - tests/migration/guestperf/engine.py | 1 - tests/migration/guestperf/plot.py | 1 - tests/migration/guestperf/shell.py | 1 - tests/qapi-schema/test-qapi.py | 3 +- tests/qemu-iotests/030 | 2 +- tests/qemu-iotests/040 | 2 +- tests/qemu-iotests/041 | 2 +- tests/qemu-iotests/044 | 2 +- tests/qemu-iotests/045 | 2 +- tests/qemu-iotests/055 | 2 +- tests/qemu-iotests/056 | 2 +- tests/qemu-iotests/057 | 2 +- tests/qemu-iotests/065 | 2 +- tests/qemu-iotests/093 | 2 +- tests/qemu-iotests/096 | 2 +- tests/qemu-iotests/118 | 2 +- tests/qemu-iotests/124 | 2 +- tests/qemu-iotests/129 | 2 +- tests/qemu-iotests/132 | 2 +- tests/qemu-iotests/136 | 2 +- tests/qemu-iotests/139 | 2 +- tests/qemu-iotests/147 | 2 +- tests/qemu-iotests/148 | 2 +- tests/qemu-iotests/149 | 3 +- tests/qemu-iotests/151 | 2 +- tests/qemu-iotests/152 | 2 +- tests/qemu-iotests/155 | 2 +- tests/qemu-iotests/163 | 2 +- tests/qemu-iotests/165 | 3 +- tests/qemu-iotests/169 | 2 +- tests/qemu-iotests/194 | 2 +- tests/qemu-iotests/196 | 2 +- tests/qemu-iotests/199 | 2 +- tests/qemu-iotests/202 | 2 +- tests/qemu-iotests/203 | 2 +- tests/qemu-iotests/205 | 2 +- tests/qemu-iotests/206 | 2 +- tests/qemu-iotests/207 | 2 +- tests/qemu-iotests/208 | 2 +- tests/qemu-iotests/209 | 2 +- tests/qemu-iotests/210 | 2 +- tests/qemu-iotests/211 | 2 +- tests/qemu-iotests/212 | 2 +- tests/qemu-iotests/213 | 2 +- tests/qemu-iotests/216 | 2 +- tests/qemu-iotests/218 | 2 +- tests/qemu-iotests/219 | 2 +- tests/qemu-iotests/222 | 2 +- tests/qemu-iotests/224 | 2 +- tests/qemu-iotests/228 | 2 +- tests/qemu-iotests/234 | 2 +- tests/qemu-iotests/235 | 2 +- tests/qemu-iotests/236 | 2 +- tests/qemu-iotests/237 | 2 +- tests/qemu-iotests/238 | 2 +- tests/qemu-iotests/242 | 2 +- tests/qemu-iotests/245 | 2 +- tests/qemu-iotests/246 | 2 +- tests/qemu-iotests/248 | 2 +- tests/qemu-iotests/254 | 2 +- tests/qemu-iotests/255 | 2 +- tests/qemu-iotests/256 | 2 +- tests/qemu-iotests/257 | 2 +- tests/qemu-iotests/258 | 2 +- tests/qemu-iotests/260 | 2 +- tests/qemu-iotests/262 | 2 +- tests/qemu-iotests/264 | 2 +- tests/qemu-iotests/266 | 2 +- tests/qemu-iotests/277 | 2 +- tests/qemu-iotests/280 | 2 +- tests/qemu-iotests/281 | 2 +- tests/qemu-iotests/check | 2 +- tests/qemu-iotests/iotests.py | 1 - tests/qemu-iotests/nbd-fault-injector.py | 3 +- tests/qemu-iotests/qcow2.py | 3 +- tests/qemu-iotests/qed.py | 3 +- tests/vm/basevm.py | 2 - tests/vm/centos | 2 +- tests/vm/fedora | 2 +- tests/vm/freebsd | 2 +- tests/vm/netbsd | 2 +- tests/vm/openbsd | 2 +- tests/vm/ubuntu.i386 | 2 +- 146 files changed, 431 insertions(+), 233 deletions(-) create mode 100644 .readthedocs.yml mode change 100644 => 100755 scripts/minikconf.py mode change 100644 => 100755 scripts/signrom.py rename tests/acceptance/{virtio_seg_max_adjust.py => virtio_check_params.py} (90%) mode change 100755 => 100644 mode change 100644 => 100755 tests/qemu-iotests/222 mode change 100644 => 100755 tests/qemu-iotests/245 mode change 100755 => 100644 tests/vm/basevm.py