mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
7a1043cef9
* "meson test" switch for iotests * deprecation of old SGX QAPI * unexport InterruptStatsProviderClass-related functions -----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmHzwdAUHHBib256aW5p QHJlZGhhdC5jb20ACgkQv/vSX3jHroOlMwgApVO6T934TwuTOFBs02Tp8KcjcKQq 5Qf5PrwbsluE8YixJERAFgfxgzbQKL/iHzkP97KoVo3CFFDc1sss7v3mrbbHxbwB jiYIgbNjRfBbZq7nNmxf2bcXxTpZYvMNEia0QPyNl1GQ0JS/RFOsEYcyVUPvVmAI djeESRyku1OS5bS5veqE2tL+AWDuodjHeW78qi+yIDRPx3jHLRzuGpQ/3KtgMN6o d61h5vVrqdxe1HYH/8sh+qU71w7drpNZVYq8PqkZyit/LXgDMyDDOks1XWarrrJE 9xzNBUNR+B6CuHtNw1DGk4rvsCBV/F0ZVki6guVGoqG8njF3l6xyqRHPbw== =2/gW -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging * configure and meson fixes * "meson test" switch for iotests * deprecation of old SGX QAPI * unexport InterruptStatsProviderClass-related functions # gpg: Signature made Fri 28 Jan 2022 10:13:36 GMT # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini-gitlab/tags/for-upstream: configure: fix parameter expansion of --cross-cc-cflags options qapi: Cleanup SGX related comments and restore @section-size check-block: replace -makecheck with TAP output qemu-iotests: require at least an argument to check-block.sh build: make check-block a meson test scripts/mtest2make: add support for SPEED=thorough check-block.sh: passthrough -jN flag of make to -j N flag of check meson: Use find_program() to resolve the entitlement.sh script exec/cpu: Make host pages variables / macros 'target agnostic' meson.build: Use a function from libfdt 1.5.1 for the library check intc: Unexport InterruptStatsProviderClass-related functions docker: add msitools to Fedora/mingw cross build-sys: fix undefined ARCH error build-sys: fix a meson deprecation warning Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
98 lines
3.2 KiB
Meson
98 lines
3.2 KiB
Meson
py3 = import('python').find_installation()
|
|
|
|
subdir('bench')
|
|
subdir('qemu-iotests')
|
|
|
|
test_qapi_outputs = [
|
|
'qapi-builtin-types.c',
|
|
'qapi-builtin-types.h',
|
|
'qapi-builtin-visit.c',
|
|
'qapi-builtin-visit.h',
|
|
'test-qapi-commands-sub-sub-module.c',
|
|
'test-qapi-commands-sub-sub-module.h',
|
|
'test-qapi-commands.c',
|
|
'test-qapi-commands.h',
|
|
'test-qapi-emit-events.c',
|
|
'test-qapi-emit-events.h',
|
|
'test-qapi-events-sub-sub-module.c',
|
|
'test-qapi-events-sub-sub-module.h',
|
|
'test-qapi-events.c',
|
|
'test-qapi-events.h',
|
|
'test-qapi-init-commands.c',
|
|
'test-qapi-init-commands.h',
|
|
'test-qapi-introspect.c',
|
|
'test-qapi-introspect.h',
|
|
'test-qapi-types-sub-sub-module.c',
|
|
'test-qapi-types-sub-sub-module.h',
|
|
'test-qapi-types.c',
|
|
'test-qapi-types.h',
|
|
'test-qapi-visit-sub-sub-module.c',
|
|
'test-qapi-visit-sub-sub-module.h',
|
|
'test-qapi-visit.c',
|
|
'test-qapi-visit.h',
|
|
]
|
|
|
|
# Problem: to generate trace events, we'd have to add the .trace-events
|
|
# file to qapi_trace_events like we do in qapi/meson.build. Since
|
|
# qapi_trace_events is used by trace/meson.build, we'd have to move
|
|
# subdir('tests') above subdir('trace') in the top-level meson.build.
|
|
# Can't, because it would break the dependency of qga on qemuutil (which
|
|
# depends on trace_ss). Not worth solving now; simply suppress trace
|
|
# event generation instead.
|
|
test_qapi_files = custom_target('Test QAPI files',
|
|
output: test_qapi_outputs,
|
|
input: files('qapi-schema/qapi-schema-test.json',
|
|
'qapi-schema/include/sub-module.json',
|
|
'qapi-schema/sub-sub-module.json'),
|
|
command: [ qapi_gen, '-o', meson.current_build_dir(),
|
|
'-b', '-p', 'test-', '@INPUT0@',
|
|
'--suppress-tracing' ],
|
|
depend_files: qapi_gen_depends)
|
|
|
|
# meson doesn't like generated output in other directories
|
|
# perhaps change qapi_gen to replace / with _, like Meson itself does?
|
|
subdir('include')
|
|
|
|
test_qapi_sources = []
|
|
test_qapi_headers = []
|
|
i = 0
|
|
foreach o: test_qapi_files.to_list() + test_qapi_files_extra.to_list()
|
|
if o.full_path().endswith('.h')
|
|
test_qapi_headers += o
|
|
endif
|
|
test_qapi_sources += o
|
|
endforeach
|
|
|
|
libtestqapi = static_library('testqapi', sources: [genh, test_qapi_sources])
|
|
testqapi = declare_dependency(link_with: libtestqapi, sources: [genh, test_qapi_headers])
|
|
|
|
test_deps = {
|
|
'test-qht-par': qht_bench,
|
|
}
|
|
|
|
if have_tools and 'CONFIG_VHOST_USER' in config_host and 'CONFIG_LINUX' in config_host
|
|
executable('vhost-user-bridge',
|
|
sources: files('vhost-user-bridge.c'),
|
|
dependencies: [qemuutil, vhost_user])
|
|
endif
|
|
|
|
test('decodetree', sh,
|
|
args: [ files('decode/check.sh'), config_host['PYTHON'], files('../scripts/decodetree.py') ],
|
|
workdir: meson.current_source_dir() / 'decode',
|
|
suite: 'decodetree')
|
|
|
|
if 'CONFIG_TCG' in config_all
|
|
subdir('fp')
|
|
endif
|
|
|
|
if not get_option('tcg').disabled()
|
|
if 'CONFIG_PLUGIN' in config_host
|
|
subdir('plugin')
|
|
endif
|
|
endif
|
|
|
|
subdir('unit')
|
|
subdir('qapi-schema')
|
|
subdir('qtest')
|
|
subdir('migration')
|