From fb91f30bb9716c391ce0441942fffa601ad99684 Mon Sep 17 00:00:00 2001 From: Yang Hongyang Date: Tue, 19 Apr 2016 15:39:13 +0800 Subject: 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 Cc: Gerd Hoffmann Cc: Michael S. Tsirkin Cc: Michael Roth Cc: Paolo Bonzini Signed-off-by: Michael Roth Cc: qemu-stable@nongnu.org --- tests/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 9de959847b..9194f1850b 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) -- cgit v1.2.1