diff options
| author | Yang Hongyang <hongyang.yang@easystack.cn> | 2016-04-19 15:39:13 +0800 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2016-04-19 16:51:15 -0500 |
| commit | fb91f30bb9716c391ce0441942fffa601ad99684 (patch) | |
| tree | f99828afde6759b9ebf0d0d3c637f990989cd1d9 /tests | |
| parent | 1f7685fafa6ba1354731a59822e5cc43323d6989 (diff) | |
| download | qemu-fb91f30bb9716c391ce0441942fffa601ad99684.zip qemu-fb91f30bb9716c391ce0441942fffa601ad99684.tar.gz qemu-fb91f30bb9716c391ce0441942fffa601ad99684.tar.bz2 | |
qemu-ga: do not run qga test when guest agent disabled
When configure with --disable-guest-agent, make check will fail with:
ERROR:tests/test-qga.c:74:fixture_setup: assertion failed (error == NULL):
Failed to execute child process "/home/xx/qemu/qemu-ga" (No such file or
directory) (g-exec-error-quark, 8)
make: *** [check-tests/test-qga] Error 1
This check was commented out by bab47d9a75a. I think that was by
mistake, because the commit message of that commit didn't mention
this change.
Signed-off-by: Yang Hongyang <hongyang.yang@easystack.cn>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Michael Roth <mdroth@linux.vnet.ibm.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Cc: qemu-stable@nongnu.org
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index 9de9598..9194f18 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -83,7 +83,9 @@ check-unit-y += tests/test-crypto-cipher$(EXESUF) check-unit-y += tests/test-crypto-secret$(EXESUF) check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlscredsx509$(EXESUF) check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlssession$(EXESUF) -#check-unit-$(CONFIG_LINUX) += tests/test-qga$(EXESUF) +ifneq (,$(findstring qemu-ga,$(TOOLS))) +check-unit-$(CONFIG_LINUX) += tests/test-qga$(EXESUF) +endif check-unit-y += tests/test-timed-average$(EXESUF) check-unit-y += tests/test-io-task$(EXESUF) check-unit-y += tests/test-io-channel-socket$(EXESUF) |