* [PULL v2 00/14] Misc patches for 2022-01-27
@ 2022-01-28 10:15 Paolo Bonzini
2022-01-28 10:15 ` [PULL v2 07/14] meson: Use find_program() to resolve the entitlement.sh script Paolo Bonzini
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Paolo Bonzini @ 2022-01-28 10:15 UTC (permalink / raw)
To: qemu-devel
The following changes since commit aeb0ae95b7f18c66158792641cb6ba0cde5789ab:
Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/python-pull-request' into staging (2022-01-22 12:03:22 +0000)
are available in the Git repository at:
https://gitlab.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to 479ca4ccd54afcd54b0163532709079233d64b97:
configure: fix parameter expansion of --cross-cc-cflags options (2022-01-28 11:13:33 +0100)
----------------------------------------------------------------
* configure and meson fixes
* "meson test" switch for iotests
* deprecation of old SGX QAPI
* unexport InterruptStatsProviderClass-related functions
----------------------------------------------------------------
Bernhard Beschow (1):
intc: Unexport InterruptStatsProviderClass-related functions
Marc-André Lureau (3):
build-sys: fix a meson deprecation warning
build-sys: fix undefined ARCH error
docker: add msitools to Fedora/mingw cross
Matheus Ferst (1):
configure: fix parameter expansion of --cross-cc-cflags options
Paolo Bonzini (4):
scripts/mtest2make: add support for SPEED=thorough
build: make check-block a meson test
qemu-iotests: require at least an argument to check-block.sh
check-block: replace -makecheck with TAP output
Philippe Mathieu-Daudé (2):
exec/cpu: Make host pages variables / macros 'target agnostic'
meson: Use find_program() to resolve the entitlement.sh script
Thomas Huth (1):
meson.build: Use a function from libfdt 1.5.1 for the library check
Vladimir Sementsov-Ogievskiy (1):
check-block.sh: passthrough -jN flag of make to -j N flag of check
Yang Zhong (1):
qapi: Cleanup SGX related comments and restore @section-size
configure | 4 +-
docs/about/deprecated.rst | 13 ++++++
docs/devel/testing.rst | 2 +-
hw/i386/sgx.c | 11 ++++-
hw/intc/i8259_common.c | 6 +--
hw/intc/ioapic_common.c | 2 +-
include/exec/cpu-all.h | 9 ----
include/exec/cpu-common.h | 9 ++++
include/hw/i386/ioapic_internal.h | 1 -
include/hw/isa/i8259_internal.h | 3 --
meson.build | 16 +++----
qapi/machine.json | 4 +-
qapi/misc-target.json | 22 ++++++---
qga/meson.build | 2 +-
scripts/mtest2make.py | 20 +++++++--
tests/Makefile.include | 16 ++-----
tests/check-block.sh | 52 +++++++++++-----------
tests/docker/dockerfiles/fedora-win32-cross.docker | 1 +
tests/docker/dockerfiles/fedora-win64-cross.docker | 1 +
tests/meson.build | 1 +
tests/qemu-iotests/check | 6 +--
tests/qemu-iotests/meson.build | 30 +++++++++++++
tests/qemu-iotests/testenv.py | 30 ++++++-------
tests/qemu-iotests/testrunner.py | 49 ++++++++++----------
tests/qtest/meson.build | 2 +-
25 files changed, 189 insertions(+), 123 deletions(-)
create mode 100644 tests/qemu-iotests/meson.build
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PULL v2 07/14] meson: Use find_program() to resolve the entitlement.sh script 2022-01-28 10:15 [PULL v2 00/14] Misc patches for 2022-01-27 Paolo Bonzini @ 2022-01-28 10:15 ` Paolo Bonzini 2022-01-28 16:59 ` [PULL v2 00/14] Misc patches for 2022-01-27 Peter Maydell 2022-02-03 16:24 ` Peter Maydell 2 siblings, 0 replies; 4+ messages in thread From: Paolo Bonzini @ 2022-01-28 10:15 UTC (permalink / raw) To: qemu-devel; +Cc: Richard Henderson, Philippe Mathieu-Daudé, Akihiko Odaki From: Philippe Mathieu-Daudé <f4bug@amsat.org> Using ../configure without any particular option generates 31 targets on Darwin, and meson search for the entitlement.sh script 31 times: Program nm found: YES Program scripts/undefsym.py found: YES (/opt/homebrew/opt/python@3.9/bin/python3.9 /Code/qemu/scripts/undefsym.py) Program scripts/feature_to_c.sh found: YES (/bin/sh /Code/qemu/scripts/feature_to_c.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh) Configuring 50-edk2-i386-secure.json using configuration Configuring 50-edk2-x86_64-secure.json using configuration Use find_program() which seems to cache the script path once found. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20220122002052.83745-1-f4bug@amsat.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- meson.build | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 4429fd2041..c69fbbd0cb 100644 --- a/meson.build +++ b/meson.build @@ -3052,17 +3052,14 @@ foreach target : target_dirs install_input += meson.current_source_dir() / entitlements endif + entitlement = find_program('scripts/entitlement.sh') emulators += {exe['name'] : custom_target(exe['name'], input: build_input, output: exe['name'], - command: [ - files('scripts/entitlement.sh'), - '@OUTPUT@', - '@INPUT@' - ]) + command: [entitlement, '@OUTPUT@', '@INPUT@']) } - meson.add_install_script('scripts/entitlement.sh', '--install', + meson.add_install_script(entitlement, '--install', get_option('bindir') / exe['name'], install_input) else -- 2.34.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PULL v2 00/14] Misc patches for 2022-01-27 2022-01-28 10:15 [PULL v2 00/14] Misc patches for 2022-01-27 Paolo Bonzini 2022-01-28 10:15 ` [PULL v2 07/14] meson: Use find_program() to resolve the entitlement.sh script Paolo Bonzini @ 2022-01-28 16:59 ` Peter Maydell 2022-02-03 16:24 ` Peter Maydell 2 siblings, 0 replies; 4+ messages in thread From: Peter Maydell @ 2022-01-28 16:59 UTC (permalink / raw) To: Paolo Bonzini; +Cc: qemu-devel On Fri, 28 Jan 2022 at 10:18, Paolo Bonzini <pbonzini@redhat.com> wrote: > > The following changes since commit aeb0ae95b7f18c66158792641cb6ba0cde5789ab: > > Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/python-pull-request' into staging (2022-01-22 12:03:22 +0000) > > are available in the Git repository at: > > https://gitlab.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 479ca4ccd54afcd54b0163532709079233d64b97: > > configure: fix parameter expansion of --cross-cc-cflags options (2022-01-28 11:13:33 +0100) > > ---------------------------------------------------------------- > * configure and meson fixes > * "meson test" switch for iotests > * deprecation of old SGX QAPI > * unexport InterruptStatsProviderClass-related functions > Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/7.0 for any user-visible changes. -- PMM ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PULL v2 00/14] Misc patches for 2022-01-27 2022-01-28 10:15 [PULL v2 00/14] Misc patches for 2022-01-27 Paolo Bonzini 2022-01-28 10:15 ` [PULL v2 07/14] meson: Use find_program() to resolve the entitlement.sh script Paolo Bonzini 2022-01-28 16:59 ` [PULL v2 00/14] Misc patches for 2022-01-27 Peter Maydell @ 2022-02-03 16:24 ` Peter Maydell 2 siblings, 0 replies; 4+ messages in thread From: Peter Maydell @ 2022-02-03 16:24 UTC (permalink / raw) To: Paolo Bonzini; +Cc: qemu-devel On Fri, 28 Jan 2022 at 10:18, Paolo Bonzini <pbonzini@redhat.com> wrote: > > The following changes since commit aeb0ae95b7f18c66158792641cb6ba0cde5789ab: > > Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/python-pull-request' into staging (2022-01-22 12:03:22 +0000) > > are available in the Git repository at: > > https://gitlab.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 479ca4ccd54afcd54b0163532709079233d64b97: > > configure: fix parameter expansion of --cross-cc-cflags options (2022-01-28 11:13:33 +0100) > > ---------------------------------------------------------------- > * configure and meson fixes > * "meson test" switch for iotests > * deprecation of old SGX QAPI > * unexport InterruptStatsProviderClass-related functions Has this switch to 'meson test' for the iotests broken the "V=1" support for 'make check'? I find that iotest failures now no longer print the useful information about what went wrong; instead you just get something like: ▶ 1/1 qcow2 qsd-jobs OK 1/1 qemu:block / qemu-iotests qcow2 ERROR 243.14s exit status 1 which means we no longer are capturing enough information in build logs to be able to diagnose failures. thanks -- PMM ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-03 16:28 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-01-28 10:15 [PULL v2 00/14] Misc patches for 2022-01-27 Paolo Bonzini 2022-01-28 10:15 ` [PULL v2 07/14] meson: Use find_program() to resolve the entitlement.sh script Paolo Bonzini 2022-01-28 16:59 ` [PULL v2 00/14] Misc patches for 2022-01-27 Peter Maydell 2022-02-03 16:24 ` Peter Maydell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).