* Move unit and bench tests into separate directories
* Clean-up and improve gitlab-ci jobs * Drop the non-working "check-speed" makefile target * Minor documentation updates -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmBLonURHHRodXRoQHJl ZGhhdC5jb20ACgkQLtnXdP5wLbVsZg/9HoRP+nUoz9y7d2/GpXP01zj5xtatMadW RFUAlCqJapWyDXlzXVlKmvjIQeBa1uvLv6eBbAr9E748Aurmwrpw+TZ0rvIgbZrG fNYwixBjWcf8BtxoqRki/zdjsBV9Lym7H0G/QxYxOfve8IdHntE5iVnI0hCpaNge E2SLAXlFsKvC7MbLtm7+KRyIyA4PAshqJWgH+T2mdOcAA6SudLU4SidyPQJo02LX 8U2NP2zB/5VldFGtc3TuFmoWhCSctfa3ntmNTBUBfJAEoB7hUTdKH3naZ52Qd2X9 nAEWJAh7yiXnClz8Ant/QywvM+OjxmxVWz2Kc/1jJYqLQVGB1e8JBWH6pJxboDJb 8z+G5SYAw5woOE+ya57doPyDbi9EHn5O6K5FIjhn/rc5YJp6SA9ilG89E3vrhr/m RMTCvm2nrPxenXXSovKi1t5SB6X8uyNKOuAXgEef8T28c03ZSZbs6u/YTDjPHSkp lU9PGxr+Ft2on+GzSXoC1HBzLyesiTsjF7leE4aB9jOGgnqCMiJsALyx/XWq5x1m wtpp7TcObB7p9DZ2Kf4601CoVaVO2ESjor9T81JLDtqVrlD0VHhuFGsFvOlo/M2k JePmg93CoX+ptP47Pyou8fnjkwCI4raM55s1SsYvVqdg2Rs1Btj6CwIqc2QEjn7N KIXZ7HG4i80= =YxBC -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-03-12' into staging * Move unit and bench tests into separate directories * Clean-up and improve gitlab-ci jobs * Drop the non-working "check-speed" makefile target * Minor documentation updates # gpg: Signature made Fri 12 Mar 2021 17:18:45 GMT # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * remotes/thuth-gitlab/tags/pull-request-2021-03-12: README: Add Documentation blurb MAINTAINERS: Merge the Gitlab-CI section into the generic CI section tests: remove "make check-speed" in favor of "make bench" gitlab-ci.yml: Merge check-crypto-old jobs into the build-crypto-old jobs gitlab-ci.yml: Merge one of the coroutine jobs with the tcg-disabled job gitlab-ci.yml: Add some missing dependencies to the jobs gitlab-ci.yml: Move build-tools-and-docs-debian to a better place tests: Move benchmarks into a separate folder tests: Move unit tests into a separate directory Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
757acb9a82
@ -171,19 +171,6 @@ check-system-debian:
|
||||
IMAGE: debian-amd64
|
||||
MAKE_CHECK_ARGS: check
|
||||
|
||||
# No targets are built here, just tools, docs, and unit tests. This
|
||||
# also feeds into the eventual documentation deployment steps later
|
||||
build-tools-and-docs-debian:
|
||||
<<: *native_build_job_definition
|
||||
variables:
|
||||
IMAGE: debian-amd64
|
||||
MAKE_CHECK_ARGS: check-unit check-softfloat ctags TAGS cscope
|
||||
CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable-tools
|
||||
artifacts:
|
||||
expire_in: 2 days
|
||||
paths:
|
||||
- build
|
||||
|
||||
acceptance-system-debian:
|
||||
<<: *native_test_job_definition
|
||||
needs:
|
||||
@ -383,6 +370,8 @@ build-disabled:
|
||||
# Xen accelerator is not detected / selected. As result it build the
|
||||
# i386-softmmu and x86_64-softmmu with KVM being the single accelerator
|
||||
# available.
|
||||
# Also use a different coroutine implementation (which is only really of
|
||||
# interest to KVM users, i.e. with TCG disabled)
|
||||
build-tcg-disabled:
|
||||
<<: *native_build_job_definition
|
||||
needs:
|
||||
@ -392,7 +381,8 @@ build-tcg-disabled:
|
||||
script:
|
||||
- mkdir build
|
||||
- cd build
|
||||
- ../configure --disable-tcg --audio-drv-list="" || { cat config.log meson-logs/meson-log.txt && exit 1; }
|
||||
- ../configure --disable-tcg --audio-drv-list="" --with-coroutine=ucontext
|
||||
|| { cat config.log meson-logs/meson-log.txt && exit 1; }
|
||||
- make -j"$JOBS"
|
||||
- make check-unit
|
||||
- make check-qapi-schema
|
||||
@ -449,6 +439,8 @@ build-user-plugins:
|
||||
|
||||
build-user-centos7:
|
||||
<<: *native_build_job_definition
|
||||
needs:
|
||||
job: amd64-centos7-container
|
||||
variables:
|
||||
IMAGE: centos7
|
||||
CONFIGURE_ARGS: --disable-system --disable-tools --disable-docs
|
||||
@ -478,6 +470,8 @@ clang-system:
|
||||
|
||||
clang-user:
|
||||
<<: *native_build_job_definition
|
||||
needs:
|
||||
job: amd64-debian-user-cross-container
|
||||
variables:
|
||||
IMAGE: debian-all-test-cross
|
||||
CONFIGURE_ARGS: --cc=clang --cxx=clang++ --disable-system
|
||||
@ -606,6 +600,8 @@ acceptance-cfi-x86_64:
|
||||
|
||||
tsan-build:
|
||||
<<: *native_build_job_definition
|
||||
needs:
|
||||
job: amd64-ubuntu2004-container
|
||||
variables:
|
||||
IMAGE: ubuntu2004
|
||||
CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10 --disable-docs
|
||||
@ -643,6 +639,8 @@ check-deprecated:
|
||||
# gprof/gcov are GCC features
|
||||
gprof-gcov:
|
||||
<<: *native_build_job_definition
|
||||
needs:
|
||||
job: amd64-ubuntu2004-container
|
||||
variables:
|
||||
IMAGE: ubuntu2004
|
||||
CONFIGURE_ARGS: --enable-gprof --enable-gcov
|
||||
@ -697,15 +695,6 @@ build-tci:
|
||||
|
||||
# Alternate coroutines implementations are only really of interest to KVM users
|
||||
# However we can't test against KVM on Gitlab-CI so we can only run unit tests
|
||||
build-coroutine-ucontext:
|
||||
<<: *native_build_job_definition
|
||||
needs:
|
||||
job: amd64-ubuntu2004-container
|
||||
variables:
|
||||
IMAGE: ubuntu2004
|
||||
CONFIGURE_ARGS: --with-coroutine=ucontext --disable-tcg
|
||||
MAKE_CHECK_ARGS: check-unit
|
||||
|
||||
build-coroutine-sigaltstack:
|
||||
<<: *native_build_job_definition
|
||||
needs:
|
||||
@ -719,7 +708,7 @@ build-coroutine-sigaltstack:
|
||||
#
|
||||
# These jobs test old gcrypt and nettle from RHEL7
|
||||
# which had some API differences.
|
||||
build-crypto-old-nettle:
|
||||
crypto-old-nettle:
|
||||
<<: *native_build_job_definition
|
||||
needs:
|
||||
job: amd64-centos7-container
|
||||
@ -727,22 +716,9 @@ build-crypto-old-nettle:
|
||||
IMAGE: centos7
|
||||
TARGETS: x86_64-softmmu x86_64-linux-user
|
||||
CONFIGURE_ARGS: --disable-gcrypt --enable-nettle
|
||||
MAKE_CHECK_ARGS: check-build
|
||||
artifacts:
|
||||
paths:
|
||||
- build
|
||||
|
||||
check-crypto-old-nettle:
|
||||
<<: *native_test_job_definition
|
||||
needs:
|
||||
- job: build-crypto-old-nettle
|
||||
artifacts: true
|
||||
variables:
|
||||
IMAGE: centos7
|
||||
MAKE_CHECK_ARGS: check
|
||||
|
||||
|
||||
build-crypto-old-gcrypt:
|
||||
crypto-old-gcrypt:
|
||||
<<: *native_build_job_definition
|
||||
needs:
|
||||
job: amd64-centos7-container
|
||||
@ -750,22 +726,9 @@ build-crypto-old-gcrypt:
|
||||
IMAGE: centos7
|
||||
TARGETS: x86_64-softmmu x86_64-linux-user
|
||||
CONFIGURE_ARGS: --disable-nettle --enable-gcrypt
|
||||
MAKE_CHECK_ARGS: check-build
|
||||
artifacts:
|
||||
paths:
|
||||
- build
|
||||
|
||||
check-crypto-old-gcrypt:
|
||||
<<: *native_test_job_definition
|
||||
needs:
|
||||
- job: build-crypto-old-gcrypt
|
||||
artifacts: true
|
||||
variables:
|
||||
IMAGE: centos7
|
||||
MAKE_CHECK_ARGS: check
|
||||
|
||||
|
||||
build-crypto-only-gnutls:
|
||||
crypto-only-gnutls:
|
||||
<<: *native_build_job_definition
|
||||
needs:
|
||||
job: amd64-centos7-container
|
||||
@ -773,20 +736,9 @@ build-crypto-only-gnutls:
|
||||
IMAGE: centos7
|
||||
TARGETS: x86_64-softmmu x86_64-linux-user
|
||||
CONFIGURE_ARGS: --disable-nettle --disable-gcrypt --enable-gnutls
|
||||
MAKE_CHECK_ARGS: check-build
|
||||
artifacts:
|
||||
paths:
|
||||
- build
|
||||
|
||||
check-crypto-only-gnutls:
|
||||
<<: *native_test_job_definition
|
||||
needs:
|
||||
- job: build-crypto-only-gnutls
|
||||
artifacts: true
|
||||
variables:
|
||||
IMAGE: centos7
|
||||
MAKE_CHECK_ARGS: check
|
||||
|
||||
|
||||
# We don't need to exercise every backend with every front-end
|
||||
build-trace-multi-user:
|
||||
<<: *native_build_job_definition
|
||||
@ -869,6 +821,21 @@ build-libvhost-user:
|
||||
- meson
|
||||
- ninja
|
||||
|
||||
# No targets are built here, just tools, docs, and unit tests. This
|
||||
# also feeds into the eventual documentation deployment steps later
|
||||
build-tools-and-docs-debian:
|
||||
<<: *native_build_job_definition
|
||||
needs:
|
||||
job: amd64-debian-container
|
||||
variables:
|
||||
IMAGE: debian-amd64
|
||||
MAKE_CHECK_ARGS: check-unit check-softfloat ctags TAGS cscope
|
||||
CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable-tools
|
||||
artifacts:
|
||||
expire_in: 2 days
|
||||
paths:
|
||||
- build
|
||||
|
||||
# Prepare for GitLab pages deployment. Anything copied into the
|
||||
# "public" directory will be deployed to $USER.gitlab.io/$PROJECT
|
||||
pages:
|
||||
|
93
MAINTAINERS
93
MAINTAINERS
@ -1537,7 +1537,7 @@ F: include/hw/southbridge/piix.h
|
||||
F: hw/misc/sga.c
|
||||
F: hw/isa/apm.c
|
||||
F: include/hw/isa/apm.h
|
||||
F: tests/test-x86-cpuid.c
|
||||
F: tests/unit/test-x86-cpuid.c
|
||||
F: tests/qtest/test-x86-cpuid-compat.c
|
||||
|
||||
PC Chipset
|
||||
@ -2219,7 +2219,7 @@ F: qemu-io*
|
||||
F: tests/qemu-iotests/
|
||||
F: util/qemu-progress.c
|
||||
F: qobject/block-qdict.c
|
||||
F: tests/check-block-qdict.c
|
||||
F: tests/unit/check-block-qdict.c
|
||||
T: git https://repo.or.cz/qemu/kevin.git block
|
||||
|
||||
Storage daemon
|
||||
@ -2245,7 +2245,7 @@ F: migration/block*
|
||||
F: include/block/aio.h
|
||||
F: include/block/aio-wait.h
|
||||
F: scripts/qemugdb/aio.py
|
||||
F: tests/test-fdmon-epoll.c
|
||||
F: tests/unit/test-fdmon-epoll.c
|
||||
T: git https://github.com/stefanha/qemu.git block
|
||||
|
||||
Block SCSI subsystem
|
||||
@ -2305,7 +2305,7 @@ F: block/dirty-bitmap.c
|
||||
F: block/qcow2-bitmap.c
|
||||
F: migration/block-dirty-bitmap.c
|
||||
F: util/hbitmap.c
|
||||
F: tests/test-hbitmap.c
|
||||
F: tests/unit/test-hbitmap.c
|
||||
F: docs/interop/bitmaps.rst
|
||||
T: git https://repo.or.cz/qemu/ericb.git bitmaps
|
||||
|
||||
@ -2326,8 +2326,8 @@ Command line option argument parsing
|
||||
M: Markus Armbruster <armbru@redhat.com>
|
||||
S: Supported
|
||||
F: include/qemu/option.h
|
||||
F: tests/test-keyval.c
|
||||
F: tests/test-qemu-opts.c
|
||||
F: tests/unit/test-keyval.c
|
||||
F: tests/unit/test-qemu-opts.c
|
||||
F: util/keyval.c
|
||||
F: util/qemu-option.c
|
||||
|
||||
@ -2445,8 +2445,8 @@ Read, Copy, Update (RCU)
|
||||
M: Paolo Bonzini <pbonzini@redhat.com>
|
||||
S: Maintained
|
||||
F: include/qemu/rcu*.h
|
||||
F: tests/rcutorture.c
|
||||
F: tests/test-rcu-*.c
|
||||
F: tests/unit/rcutorture.c
|
||||
F: tests/unit/test-rcu-*.c
|
||||
F: util/rcu.c
|
||||
|
||||
Human Monitor (HMP)
|
||||
@ -2524,10 +2524,10 @@ F: include/qapi/
|
||||
X: include/qapi/qmp/
|
||||
F: include/qapi/qmp/dispatch.h
|
||||
F: tests/qapi-schema/
|
||||
F: tests/test-*-visitor.c
|
||||
F: tests/test-qapi-*.c
|
||||
F: tests/test-qmp-*.c
|
||||
F: tests/test-visitor-serialization.c
|
||||
F: tests/unit/test-*-visitor.c
|
||||
F: tests/unit/test-qapi-*.c
|
||||
F: tests/unit/test-qmp-*.c
|
||||
F: tests/unit/test-visitor-serialization.c
|
||||
F: scripts/qapi-gen.py
|
||||
F: scripts/qapi/*
|
||||
F: docs/sphinx/qapidoc.py
|
||||
@ -2548,14 +2548,14 @@ F: qobject/
|
||||
F: include/qapi/qmp/
|
||||
X: include/qapi/qmp/dispatch.h
|
||||
F: scripts/coccinelle/qobject.cocci
|
||||
F: tests/check-qdict.c
|
||||
F: tests/check-qjson.c
|
||||
F: tests/check-qlist.c
|
||||
F: tests/check-qlit.c
|
||||
F: tests/check-qnull.c
|
||||
F: tests/check-qnum.c
|
||||
F: tests/check-qobject.c
|
||||
F: tests/check-qstring.c
|
||||
F: tests/unit/check-qdict.c
|
||||
F: tests/unit/check-qjson.c
|
||||
F: tests/unit/check-qlist.c
|
||||
F: tests/unit/check-qlit.c
|
||||
F: tests/unit/check-qnull.c
|
||||
F: tests/unit/check-qnum.c
|
||||
F: tests/unit/check-qobject.c
|
||||
F: tests/unit/check-qstring.c
|
||||
F: tests/data/qobject/qdict.txt
|
||||
T: git https://repo.or.cz/qemu/armbru.git qapi-next
|
||||
|
||||
@ -2566,7 +2566,7 @@ F: qga/
|
||||
F: docs/interop/qemu-ga.rst
|
||||
F: docs/interop/qemu-ga-ref.rst
|
||||
F: scripts/qemu-guest-agent/
|
||||
F: tests/test-qga.c
|
||||
F: tests/unit/test-qga.c
|
||||
T: git https://github.com/mdroth/qemu.git qga
|
||||
|
||||
QOM
|
||||
@ -2587,9 +2587,9 @@ F: scripts/coccinelle/qom-parent-type.cocci
|
||||
F: softmmu/qdev-monitor.c
|
||||
F: stubs/qdev.c
|
||||
F: qom/
|
||||
F: tests/check-qom-interface.c
|
||||
F: tests/check-qom-proplist.c
|
||||
F: tests/test-qdev-global-props.c
|
||||
F: tests/unit/check-qom-interface.c
|
||||
F: tests/unit/check-qom-proplist.c
|
||||
F: tests/unit/test-qdev-global-props.c
|
||||
|
||||
QOM boilerplate conversion script
|
||||
M: Eduardo Habkost <ehabkost@redhat.com>
|
||||
@ -2728,10 +2728,10 @@ S: Maintained
|
||||
F: crypto/
|
||||
F: include/crypto/
|
||||
F: qapi/crypto.json
|
||||
F: tests/test-crypto-*
|
||||
F: tests/benchmark-crypto-*
|
||||
F: tests/crypto-tls-*
|
||||
F: tests/pkix_asn1_tab.c
|
||||
F: tests/unit/test-crypto-*
|
||||
F: tests/bench/benchmark-crypto-*
|
||||
F: tests/unit/crypto-tls-*
|
||||
F: tests/unit/pkix_asn1_tab.c
|
||||
F: qemu.sasl
|
||||
|
||||
Coroutines
|
||||
@ -2740,7 +2740,7 @@ M: Kevin Wolf <kwolf@redhat.com>
|
||||
S: Maintained
|
||||
F: util/*coroutine*
|
||||
F: include/qemu/coroutine*
|
||||
F: tests/test-coroutine.c
|
||||
F: tests/unit/test-coroutine.c
|
||||
|
||||
Buffers
|
||||
M: Daniel P. Berrange <berrange@redhat.com>
|
||||
@ -2753,7 +2753,7 @@ M: Daniel P. Berrange <berrange@redhat.com>
|
||||
S: Maintained
|
||||
F: io/
|
||||
F: include/io/
|
||||
F: tests/test-io-*
|
||||
F: tests/unit/test-io-*
|
||||
|
||||
User authorization
|
||||
M: Daniel P. Berrange <berrange@redhat.com>
|
||||
@ -2761,7 +2761,7 @@ S: Maintained
|
||||
F: authz/
|
||||
F: qapi/authz.json
|
||||
F: include/authz/
|
||||
F: tests/test-authz-*
|
||||
F: tests/unit/test-authz-*
|
||||
|
||||
Sockets
|
||||
M: Daniel P. Berrange <berrange@redhat.com>
|
||||
@ -2776,7 +2776,7 @@ M: Daniel P. Berrange <berrange@redhat.com>
|
||||
S: Odd Fixes
|
||||
F: util/filemonitor*.c
|
||||
F: include/qemu/filemonitor.h
|
||||
F: tests/test-util-filemonitor.c
|
||||
F: tests/unit/test-util-filemonitor.c
|
||||
|
||||
Throttling infrastructure
|
||||
M: Alberto Garcia <berto@igalia.com>
|
||||
@ -2786,7 +2786,7 @@ F: include/block/throttle-groups.h
|
||||
F: include/qemu/throttle*.h
|
||||
F: util/throttle.c
|
||||
F: docs/throttle.txt
|
||||
F: tests/test-throttle.c
|
||||
F: tests/unit/test-throttle.c
|
||||
L: qemu-block@nongnu.org
|
||||
|
||||
UUID
|
||||
@ -2794,7 +2794,7 @@ M: Fam Zheng <fam@euphon.net>
|
||||
S: Supported
|
||||
F: util/uuid.c
|
||||
F: include/qemu/uuid.h
|
||||
F: tests/test-uuid.c
|
||||
F: tests/unit/test-uuid.c
|
||||
|
||||
Yank feature
|
||||
M: Lukas Straub <lukasstraub2@web.de>
|
||||
@ -3246,7 +3246,7 @@ M: Xie Changlong <xiechanglong.d@gmail.com>
|
||||
S: Supported
|
||||
F: replication*
|
||||
F: block/replication.c
|
||||
F: tests/test-replication.c
|
||||
F: tests/unit/test-replication.c
|
||||
F: docs/block-replication.txt
|
||||
|
||||
PVRDMA
|
||||
@ -3291,19 +3291,23 @@ F: include/hw/remote/iohub.h
|
||||
|
||||
Build and test automation
|
||||
-------------------------
|
||||
Build and test automation
|
||||
Build and test automation, general continuous integration
|
||||
M: Alex Bennée <alex.bennee@linaro.org>
|
||||
M: Fam Zheng <fam@euphon.net>
|
||||
R: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||
M: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
||||
M: Thomas Huth <thuth@redhat.com>
|
||||
R: Wainer dos Santos Moschetta <wainersm@redhat.com>
|
||||
R: Willian Rampazzo <willianr@redhat.com>
|
||||
S: Maintained
|
||||
F: .github/lockdown.yml
|
||||
F: .gitlab-ci.yml
|
||||
F: .gitlab-ci.d/
|
||||
F: .travis.yml
|
||||
F: scripts/ci/
|
||||
F: tests/docker/
|
||||
F: tests/vm/
|
||||
F: scripts/archive-source.sh
|
||||
W: https://gitlab.com/qemu-project/qemu/pipelines
|
||||
W: https://travis-ci.org/qemu/qemu
|
||||
W: http://patchew.org/QEMU/
|
||||
|
||||
FreeBSD Hosted Continuous Integration
|
||||
M: Ed Maste <emaste@freebsd.org>
|
||||
@ -3318,17 +3322,6 @@ S: Maintained
|
||||
F: .cirrus.yml
|
||||
W: https://cirrus-ci.com/github/qemu/qemu
|
||||
|
||||
GitLab Continuous Integration
|
||||
M: Thomas Huth <thuth@redhat.com>
|
||||
M: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||
M: Alex Bennée <alex.bennee@linaro.org>
|
||||
R: Wainer dos Santos Moschetta <wainersm@redhat.com>
|
||||
S: Maintained
|
||||
F: .gitlab-ci.yml
|
||||
F: .gitlab-ci.d/crossbuilds.yml
|
||||
F: .gitlab-ci.d/*py
|
||||
F: scripts/ci/gitlab-pipeline-status
|
||||
|
||||
Guest Test Compilation Support
|
||||
M: Alex Bennée <alex.bennee@linaro.org>
|
||||
R: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
||||
|
11
README.rst
11
README.rst
@ -31,6 +31,17 @@ QEMU as a whole is released under the GNU General Public License,
|
||||
version 2. For full licensing details, consult the LICENSE file.
|
||||
|
||||
|
||||
Documentation
|
||||
=============
|
||||
|
||||
Documentation can be found hosted online at
|
||||
`<https://www.qemu.org/documentation/>`_. The documentation for the
|
||||
current development version that is available at
|
||||
`<https://www.qemu.org/docs/master/>`_ is generated from the ``docs/``
|
||||
folder in the source tree, and is built by `Sphinx
|
||||
<https://www.sphinx-doc.org/en/master/>_`.
|
||||
|
||||
|
||||
Building
|
||||
========
|
||||
|
||||
|
@ -3,13 +3,13 @@
|
||||
.PHONY: check-help
|
||||
check-help:
|
||||
@echo "Regression testing targets:"
|
||||
@echo
|
||||
@echo " $(MAKE) check Run block, qapi-schema, unit, softfloat, qtest and decodetree tests"
|
||||
@echo " $(MAKE) bench Run speed tests"
|
||||
@echo
|
||||
@echo "Individual test suites:"
|
||||
@echo " $(MAKE) check-qtest-TARGET Run qtest tests for given target"
|
||||
@echo " $(MAKE) check-qtest Run qtest tests"
|
||||
@echo " $(MAKE) check-unit Run qobject tests"
|
||||
@echo " $(MAKE) check-speed Run qobject speed tests"
|
||||
@echo " $(MAKE) check-qapi-schema Run QAPI schema tests"
|
||||
@echo " $(MAKE) check-block Run block tests"
|
||||
ifneq ($(filter $(all-check-targets), check-softfloat),)
|
||||
@ -155,8 +155,4 @@ check-clean:
|
||||
|
||||
clean: check-clean
|
||||
|
||||
# For backwards compatibility
|
||||
|
||||
check-speed: bench-speed
|
||||
|
||||
endif
|
||||
|
34
tests/bench/meson.build
Normal file
34
tests/bench/meson.build
Normal file
@ -0,0 +1,34 @@
|
||||
|
||||
qht_bench = executable('qht-bench',
|
||||
sources: 'qht-bench.c',
|
||||
dependencies: [qemuutil])
|
||||
|
||||
executable('atomic_add-bench',
|
||||
sources: files('atomic_add-bench.c'),
|
||||
dependencies: [qemuutil],
|
||||
build_by_default: false)
|
||||
|
||||
executable('atomic64-bench',
|
||||
sources: files('atomic64-bench.c'),
|
||||
dependencies: [qemuutil],
|
||||
build_by_default: false)
|
||||
|
||||
benchs = {}
|
||||
|
||||
if have_block
|
||||
benchs += {
|
||||
'benchmark-crypto-hash': [crypto],
|
||||
'benchmark-crypto-hmac': [crypto],
|
||||
'benchmark-crypto-cipher': [crypto],
|
||||
}
|
||||
endif
|
||||
|
||||
foreach bench_name, deps: benchs
|
||||
exe = executable(bench_name, bench_name + '.c',
|
||||
dependencies: [qemuutil] + deps)
|
||||
benchmark(bench_name, exe,
|
||||
args: ['--tap', '-k'],
|
||||
protocol: 'tap',
|
||||
timeout: 0,
|
||||
suite: ['speed'])
|
||||
endforeach
|
@ -1,18 +1,6 @@
|
||||
py3 = import('python').find_installation()
|
||||
|
||||
qht_bench = executable('qht-bench',
|
||||
sources: 'qht-bench.c',
|
||||
dependencies: [qemuutil])
|
||||
|
||||
executable('atomic_add-bench',
|
||||
sources: files('atomic_add-bench.c'),
|
||||
dependencies: [qemuutil],
|
||||
build_by_default: false)
|
||||
|
||||
executable('atomic64-bench',
|
||||
sources: files('atomic64-bench.c'),
|
||||
dependencies: [qemuutil],
|
||||
build_by_default: false)
|
||||
subdir('bench')
|
||||
|
||||
test_qapi_outputs = [
|
||||
'qapi-builtin-types.c',
|
||||
@ -69,211 +57,10 @@ endforeach
|
||||
libtestqapi = static_library('testqapi', sources: [genh, test_qapi_sources])
|
||||
testqapi = declare_dependency(link_with: libtestqapi, sources: [genh, test_qapi_headers])
|
||||
|
||||
testblock = declare_dependency(dependencies: [block], sources: 'iothread.c')
|
||||
|
||||
tests = {
|
||||
'check-block-qdict': [],
|
||||
'check-qdict': [],
|
||||
'check-qnum': [],
|
||||
'check-qstring': [],
|
||||
'check-qlist': [],
|
||||
'check-qnull': [],
|
||||
'check-qobject': [],
|
||||
'check-qjson': [],
|
||||
'check-qlit': [],
|
||||
'test-qobject-output-visitor': [testqapi],
|
||||
'test-clone-visitor': [testqapi],
|
||||
'test-qobject-input-visitor': [testqapi],
|
||||
'test-string-input-visitor': [testqapi],
|
||||
'test-string-output-visitor': [testqapi],
|
||||
'test-opts-visitor': [testqapi],
|
||||
'test-visitor-serialization': [testqapi],
|
||||
'test-bitmap': [],
|
||||
# all code tested by test-x86-cpuid is inside topology.h
|
||||
'test-x86-cpuid': [],
|
||||
'test-cutils': [],
|
||||
'test-shift128': [],
|
||||
'test-mul64': [],
|
||||
# all code tested by test-int128 is inside int128.h
|
||||
'test-int128': [],
|
||||
'rcutorture': [],
|
||||
'test-rcu-list': [],
|
||||
'test-rcu-simpleq': [],
|
||||
'test-rcu-tailq': [],
|
||||
'test-rcu-slist': [],
|
||||
'test-qdist': [],
|
||||
'test-qht': [],
|
||||
'test-bitops': [],
|
||||
'test-bitcnt': [],
|
||||
'test-qgraph': ['qtest/libqos/qgraph.c'],
|
||||
'check-qom-interface': [qom],
|
||||
'check-qom-proplist': [qom],
|
||||
'test-qemu-opts': [],
|
||||
'test-keyval': [testqapi],
|
||||
'test-logging': [],
|
||||
'test-uuid': [],
|
||||
'ptimer-test': ['ptimer-test-stubs.c', meson.source_root() / 'hw/core/ptimer.c'],
|
||||
'test-qapi-util': [],
|
||||
}
|
||||
|
||||
if have_system or have_tools
|
||||
tests += {
|
||||
'test-qmp-event': [testqapi],
|
||||
}
|
||||
endif
|
||||
|
||||
test_deps = {
|
||||
'test-qht-par': qht_bench,
|
||||
}
|
||||
|
||||
benchs = {}
|
||||
|
||||
if have_block
|
||||
tests += {
|
||||
'test-coroutine': [testblock],
|
||||
'test-aio': [testblock],
|
||||
'test-aio-multithread': [testblock],
|
||||
'test-throttle': [testblock],
|
||||
'test-thread-pool': [testblock],
|
||||
'test-hbitmap': [testblock],
|
||||
'test-bdrv-drain': [testblock],
|
||||
'test-bdrv-graph-mod': [testblock],
|
||||
'test-blockjob': [testblock],
|
||||
'test-blockjob-txn': [testblock],
|
||||
'test-block-backend': [testblock],
|
||||
'test-block-iothread': [testblock],
|
||||
'test-write-threshold': [testblock],
|
||||
'test-crypto-hash': [crypto],
|
||||
'test-crypto-hmac': [crypto],
|
||||
'test-crypto-cipher': [crypto],
|
||||
'test-crypto-secret': [crypto, keyutils],
|
||||
'test-authz-simple': [authz],
|
||||
'test-authz-list': [authz],
|
||||
'test-authz-listfile': [authz],
|
||||
'test-io-task': [testblock],
|
||||
'test-io-channel-socket': ['socket-helpers.c', 'io-channel-helpers.c', io],
|
||||
'test-io-channel-file': ['io-channel-helpers.c', io],
|
||||
'test-io-channel-command': ['io-channel-helpers.c', io],
|
||||
'test-io-channel-buffer': ['io-channel-helpers.c', io],
|
||||
'test-crypto-ivgen': [io],
|
||||
'test-crypto-afsplit': [io],
|
||||
'test-crypto-block': [io],
|
||||
}
|
||||
if 'CONFIG_GNUTLS' in config_host and \
|
||||
'CONFIG_TASN1' in config_host and \
|
||||
'CONFIG_POSIX' in config_host
|
||||
tests += {
|
||||
'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c',
|
||||
tasn1, crypto, gnutls],
|
||||
'test-crypto-tlssession': ['crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c', 'crypto-tls-psk-helpers.c',
|
||||
tasn1, crypto, gnutls],
|
||||
'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c',
|
||||
tasn1, io, crypto, gnutls]}
|
||||
endif
|
||||
if 'CONFIG_AUTH_PAM' in config_host
|
||||
tests += {'test-authz-pam': [authz]}
|
||||
endif
|
||||
if 'CONFIG_QEMU_PRIVATE_XTS' in config_host
|
||||
tests += {'test-crypto-xts': [crypto, io]}
|
||||
endif
|
||||
if 'CONFIG_POSIX' in config_host
|
||||
tests += {'test-image-locking': [testblock]}
|
||||
endif
|
||||
if 'CONFIG_REPLICATION' in config_host
|
||||
tests += {'test-replication': [testblock]}
|
||||
endif
|
||||
if 'CONFIG_NETTLE' in config_host or 'CONFIG_GCRYPT' in config_host
|
||||
tests += {'test-crypto-pbkdf': [io]}
|
||||
endif
|
||||
if 'CONFIG_EPOLL_CREATE1' in config_host
|
||||
tests += {'test-fdmon-epoll': [testblock]}
|
||||
endif
|
||||
benchs += {
|
||||
'benchmark-crypto-hash': [crypto],
|
||||
'benchmark-crypto-hmac': [crypto],
|
||||
'benchmark-crypto-cipher': [crypto],
|
||||
}
|
||||
endif
|
||||
|
||||
if have_system
|
||||
tests += {
|
||||
'test-iov': [],
|
||||
'test-qmp-cmds': [testqapi],
|
||||
'test-xbzrle': [migration],
|
||||
'test-timed-average': [],
|
||||
'test-util-sockets': ['socket-helpers.c'],
|
||||
'test-base64': [],
|
||||
'test-bufferiszero': [],
|
||||
'test-vmstate': [migration, io]
|
||||
}
|
||||
if 'CONFIG_INOTIFY1' in config_host
|
||||
tests += {'test-util-filemonitor': []}
|
||||
endif
|
||||
|
||||
# Some tests: test-char, test-qdev-global-props, and test-qga,
|
||||
# are not runnable under TSan due to a known issue.
|
||||
# https://github.com/google/sanitizers/issues/1116
|
||||
if 'CONFIG_TSAN' not in config_host
|
||||
if 'CONFIG_POSIX' in config_host
|
||||
tests += {
|
||||
'test-char': ['socket-helpers.c', qom, io, chardev]
|
||||
}
|
||||
endif
|
||||
|
||||
tests += {
|
||||
'test-qdev-global-props': [qom, hwcore, testqapi]
|
||||
}
|
||||
endif
|
||||
endif
|
||||
|
||||
if 'CONFIG_TSAN' not in config_host and \
|
||||
'CONFIG_GUEST_AGENT' in config_host and \
|
||||
'CONFIG_LINUX' in config_host
|
||||
tests += {'test-qga': ['qtest/libqtest.c']}
|
||||
test_deps += {'test-qga': qga}
|
||||
endif
|
||||
|
||||
test_env = environment()
|
||||
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
|
||||
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
|
||||
|
||||
slow_tests = {
|
||||
'test-crypto-tlscredsx509': 45,
|
||||
'test-crypto-tlssession': 45
|
||||
}
|
||||
|
||||
foreach test_name, extra: tests
|
||||
src = [test_name + '.c']
|
||||
deps = [qemuutil]
|
||||
if extra.length() > 0
|
||||
# use a sourceset to quickly separate sources and deps
|
||||
test_ss = ss.source_set()
|
||||
test_ss.add(extra)
|
||||
src += test_ss.all_sources()
|
||||
deps += test_ss.all_dependencies()
|
||||
endif
|
||||
exe = executable(test_name, src, genh, dependencies: deps)
|
||||
|
||||
test(test_name, exe,
|
||||
depends: test_deps.get(test_name, []),
|
||||
env: test_env,
|
||||
args: ['--tap', '-k'],
|
||||
protocol: 'tap',
|
||||
timeout: slow_tests.get(test_name, 30),
|
||||
priority: slow_tests.get(test_name, 30),
|
||||
suite: ['unit'])
|
||||
endforeach
|
||||
|
||||
foreach bench_name, deps: benchs
|
||||
exe = executable(bench_name, bench_name + '.c',
|
||||
dependencies: [qemuutil] + deps)
|
||||
benchmark(bench_name, exe,
|
||||
args: ['--tap', '-k'],
|
||||
protocol: 'tap',
|
||||
timeout: 0,
|
||||
suite: ['speed'])
|
||||
endforeach
|
||||
|
||||
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'),
|
||||
@ -299,6 +86,7 @@ if not get_option('tcg').disabled()
|
||||
endif
|
||||
endif
|
||||
|
||||
subdir('unit')
|
||||
subdir('qapi-schema')
|
||||
subdir('qtest')
|
||||
subdir('migration')
|
||||
|
184
tests/unit/meson.build
Normal file
184
tests/unit/meson.build
Normal file
@ -0,0 +1,184 @@
|
||||
|
||||
testblock = declare_dependency(dependencies: [block], sources: 'iothread.c')
|
||||
|
||||
tests = {
|
||||
'check-block-qdict': [],
|
||||
'check-qdict': [],
|
||||
'check-qnum': [],
|
||||
'check-qstring': [],
|
||||
'check-qlist': [],
|
||||
'check-qnull': [],
|
||||
'check-qobject': [],
|
||||
'check-qjson': [],
|
||||
'check-qlit': [],
|
||||
'test-qobject-output-visitor': [testqapi],
|
||||
'test-clone-visitor': [testqapi],
|
||||
'test-qobject-input-visitor': [testqapi],
|
||||
'test-string-input-visitor': [testqapi],
|
||||
'test-string-output-visitor': [testqapi],
|
||||
'test-opts-visitor': [testqapi],
|
||||
'test-visitor-serialization': [testqapi],
|
||||
'test-bitmap': [],
|
||||
# all code tested by test-x86-cpuid is inside topology.h
|
||||
'test-x86-cpuid': [],
|
||||
'test-cutils': [],
|
||||
'test-shift128': [],
|
||||
'test-mul64': [],
|
||||
# all code tested by test-int128 is inside int128.h
|
||||
'test-int128': [],
|
||||
'rcutorture': [],
|
||||
'test-rcu-list': [],
|
||||
'test-rcu-simpleq': [],
|
||||
'test-rcu-tailq': [],
|
||||
'test-rcu-slist': [],
|
||||
'test-qdist': [],
|
||||
'test-qht': [],
|
||||
'test-bitops': [],
|
||||
'test-bitcnt': [],
|
||||
'test-qgraph': ['../qtest/libqos/qgraph.c'],
|
||||
'check-qom-interface': [qom],
|
||||
'check-qom-proplist': [qom],
|
||||
'test-qemu-opts': [],
|
||||
'test-keyval': [testqapi],
|
||||
'test-logging': [],
|
||||
'test-uuid': [],
|
||||
'ptimer-test': ['ptimer-test-stubs.c', meson.source_root() / 'hw/core/ptimer.c'],
|
||||
'test-qapi-util': [],
|
||||
}
|
||||
|
||||
if have_system or have_tools
|
||||
tests += {
|
||||
'test-qmp-event': [testqapi],
|
||||
}
|
||||
endif
|
||||
|
||||
if have_block
|
||||
tests += {
|
||||
'test-coroutine': [testblock],
|
||||
'test-aio': [testblock],
|
||||
'test-aio-multithread': [testblock],
|
||||
'test-throttle': [testblock],
|
||||
'test-thread-pool': [testblock],
|
||||
'test-hbitmap': [testblock],
|
||||
'test-bdrv-drain': [testblock],
|
||||
'test-bdrv-graph-mod': [testblock],
|
||||
'test-blockjob': [testblock],
|
||||
'test-blockjob-txn': [testblock],
|
||||
'test-block-backend': [testblock],
|
||||
'test-block-iothread': [testblock],
|
||||
'test-write-threshold': [testblock],
|
||||
'test-crypto-hash': [crypto],
|
||||
'test-crypto-hmac': [crypto],
|
||||
'test-crypto-cipher': [crypto],
|
||||
'test-crypto-secret': [crypto, keyutils],
|
||||
'test-authz-simple': [authz],
|
||||
'test-authz-list': [authz],
|
||||
'test-authz-listfile': [authz],
|
||||
'test-io-task': [testblock],
|
||||
'test-io-channel-socket': ['socket-helpers.c', 'io-channel-helpers.c', io],
|
||||
'test-io-channel-file': ['io-channel-helpers.c', io],
|
||||
'test-io-channel-command': ['io-channel-helpers.c', io],
|
||||
'test-io-channel-buffer': ['io-channel-helpers.c', io],
|
||||
'test-crypto-ivgen': [io],
|
||||
'test-crypto-afsplit': [io],
|
||||
'test-crypto-block': [io],
|
||||
}
|
||||
if 'CONFIG_GNUTLS' in config_host and \
|
||||
'CONFIG_TASN1' in config_host and \
|
||||
'CONFIG_POSIX' in config_host
|
||||
tests += {
|
||||
'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c',
|
||||
tasn1, crypto, gnutls],
|
||||
'test-crypto-tlssession': ['crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c', 'crypto-tls-psk-helpers.c',
|
||||
tasn1, crypto, gnutls],
|
||||
'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c',
|
||||
tasn1, io, crypto, gnutls]}
|
||||
endif
|
||||
if 'CONFIG_AUTH_PAM' in config_host
|
||||
tests += {'test-authz-pam': [authz]}
|
||||
endif
|
||||
if 'CONFIG_QEMU_PRIVATE_XTS' in config_host
|
||||
tests += {'test-crypto-xts': [crypto, io]}
|
||||
endif
|
||||
if 'CONFIG_POSIX' in config_host
|
||||
tests += {'test-image-locking': [testblock]}
|
||||
endif
|
||||
if 'CONFIG_REPLICATION' in config_host
|
||||
tests += {'test-replication': [testblock]}
|
||||
endif
|
||||
if 'CONFIG_NETTLE' in config_host or 'CONFIG_GCRYPT' in config_host
|
||||
tests += {'test-crypto-pbkdf': [io]}
|
||||
endif
|
||||
if 'CONFIG_EPOLL_CREATE1' in config_host
|
||||
tests += {'test-fdmon-epoll': [testblock]}
|
||||
endif
|
||||
endif
|
||||
|
||||
if have_system
|
||||
tests += {
|
||||
'test-iov': [],
|
||||
'test-qmp-cmds': [testqapi],
|
||||
'test-xbzrle': [migration],
|
||||
'test-timed-average': [],
|
||||
'test-util-sockets': ['socket-helpers.c'],
|
||||
'test-base64': [],
|
||||
'test-bufferiszero': [],
|
||||
'test-vmstate': [migration, io]
|
||||
}
|
||||
if 'CONFIG_INOTIFY1' in config_host
|
||||
tests += {'test-util-filemonitor': []}
|
||||
endif
|
||||
|
||||
# Some tests: test-char, test-qdev-global-props, and test-qga,
|
||||
# are not runnable under TSan due to a known issue.
|
||||
# https://github.com/google/sanitizers/issues/1116
|
||||
if 'CONFIG_TSAN' not in config_host
|
||||
if 'CONFIG_POSIX' in config_host
|
||||
tests += {
|
||||
'test-char': ['socket-helpers.c', qom, io, chardev]
|
||||
}
|
||||
endif
|
||||
|
||||
tests += {
|
||||
'test-qdev-global-props': [qom, hwcore, testqapi]
|
||||
}
|
||||
endif
|
||||
endif
|
||||
|
||||
if 'CONFIG_TSAN' not in config_host and \
|
||||
'CONFIG_GUEST_AGENT' in config_host and \
|
||||
'CONFIG_LINUX' in config_host
|
||||
tests += {'test-qga': ['../qtest/libqtest.c']}
|
||||
test_deps += {'test-qga': qga}
|
||||
endif
|
||||
|
||||
test_env = environment()
|
||||
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
|
||||
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
|
||||
|
||||
slow_tests = {
|
||||
'test-crypto-tlscredsx509': 45,
|
||||
'test-crypto-tlssession': 45
|
||||
}
|
||||
|
||||
foreach test_name, extra: tests
|
||||
src = [test_name + '.c']
|
||||
deps = [qemuutil]
|
||||
if extra.length() > 0
|
||||
# use a sourceset to quickly separate sources and deps
|
||||
test_ss = ss.source_set()
|
||||
test_ss.add(extra)
|
||||
src += test_ss.all_sources()
|
||||
deps += test_ss.all_dependencies()
|
||||
endif
|
||||
exe = executable(test_name, src, genh, dependencies: deps)
|
||||
|
||||
test(test_name, exe,
|
||||
depends: test_deps.get(test_name, []),
|
||||
env: test_env,
|
||||
args: ['--tap', '-k'],
|
||||
protocol: 'tap',
|
||||
timeout: slow_tests.get(test_name, 30),
|
||||
priority: slow_tests.get(test_name, 30),
|
||||
suite: ['unit'])
|
||||
endforeach
|
@ -4,7 +4,7 @@
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "tests/crypto-tls-x509-helpers.h"
|
||||
#include "crypto-tls-x509-helpers.h"
|
||||
|
||||
#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT
|
||||
|
@ -4,7 +4,7 @@
|
||||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
|
||||
#include "qtest/libqos/libqtest.h"
|
||||
#include "../qtest/libqos/libqtest.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qmp/qlist.h"
|
||||
|
@ -17,8 +17,8 @@
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qtest/libqos/qgraph.h"
|
||||
#include "qtest/libqos/qgraph_internal.h"
|
||||
#include "../qtest/libqos/qgraph.h"
|
||||
#include "../qtest/libqos/qgraph_internal.h"
|
||||
|
||||
#define MACHINE_PC "x86_64/pc"
|
||||
#define MACHINE_RASPI2 "arm/raspi2"
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user