From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aseEU-0005Xf-3T for qemu-devel@nongnu.org; Tue, 19 Apr 2016 18:34:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aseEP-0001Ja-IV for qemu-devel@nongnu.org; Tue, 19 Apr 2016 18:34:58 -0400 Received: from e18.ny.us.ibm.com ([129.33.205.208]:33816) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aseEP-0001JN-Dn for qemu-devel@nongnu.org; Tue, 19 Apr 2016 18:34:53 -0400 Received: from localhost by e18.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 19 Apr 2016 18:34:52 -0400 From: Michael Roth Date: Tue, 19 Apr 2016 17:34:34 -0500 Message-Id: <1461105274-12594-2-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1461105274-12594-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1461105274-12594-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PULL 1/1] qemu-ga: do not run qga test when guest agent disabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, peter.maydell@linaro.org, Yang Hongyang , Gerd Hoffmann , "Michael S. Tsirkin" , Paolo Bonzini From: Yang Hongyang 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 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) -- 1.9.1