diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-10-15 16:47:43 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-02-21 10:35:53 +0100 |
| commit | 20cf5cb487021dd1bec1eec326af138a8b15d987 (patch) | |
| tree | 22ed924e9d12d6fec8fd7d68894c5686991286ac /tests | |
| parent | 35acbb30582ea11cd8e98670fcd9ee90fa5f530b (diff) | |
| download | qemu-20cf5cb487021dd1bec1eec326af138a8b15d987.zip qemu-20cf5cb487021dd1bec1eec326af138a8b15d987.tar.gz qemu-20cf5cb487021dd1bec1eec326af138a8b15d987.tar.bz2 | |
configure, meson: move guest-agent, tools to meson
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.include | 2 | ||||
| -rw-r--r-- | tests/unit/meson.build | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index 646c8b1..e7153c8 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -150,7 +150,7 @@ check-acceptance: check-acceptance-deprecated-warning | check-avocado .PHONY: check-block check check-clean get-vm-images check: -ifeq ($(CONFIG_TOOLS)$(CONFIG_POSIX),yy) +ifneq ($(.check-block.deps),) check: check-block check-block: run-ninja $(if $(MAKE.n),,+)$(MESON) test $(MTESTARGS) $(.mtestargs) --verbose \ diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 0959061..3a51759 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -149,9 +149,7 @@ if have_system endif endif -if 'CONFIG_TSAN' not in config_host and \ - 'CONFIG_GUEST_AGENT' in config_host and \ - 'CONFIG_LINUX' in config_host +if have_ga and targetos == 'linux' and 'CONFIG_TSAN' not in config_host tests += {'test-qga': ['../qtest/libqtest.c']} test_deps += {'test-qga': qga} endif |