From patchwork Tue Apr 19 07:39:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Hongyang X-Patchwork-Id: 8877401 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 73E249F1D3 for ; Tue, 19 Apr 2016 07:40:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A09320268 for ; Tue, 19 Apr 2016 07:40:27 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 674A8201FA for ; Tue, 19 Apr 2016 07:40:16 +0000 (UTC) Received: from localhost ([::1]:53142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asQGd-00072Z-Iy for patchwork-qemu-devel@patchwork.kernel.org; Tue, 19 Apr 2016 03:40:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asQGQ-0006rW-JV for qemu-devel@nongnu.org; Tue, 19 Apr 2016 03:40:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1asQGM-0000Bf-R7 for qemu-devel@nongnu.org; Tue, 19 Apr 2016 03:40:02 -0400 Received: from m109-177.yeah.net ([123.58.177.109]:9118) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asQGM-0000AU-0h for qemu-devel@nongnu.org; Tue, 19 Apr 2016 03:39:58 -0400 Received: from centos7.localdomain (unknown [180.109.136.67]) by m199-177.yeah.net (HMail) with ESMTPSA id 4CD2911056A3; Tue, 19 Apr 2016 15:39:35 +0800 (CST) From: Yang Hongyang To: qemu-devel@nongnu.org Date: Tue, 19 Apr 2016 15:39:13 +0800 Message-Id: <1461051553-14720-1-git-send-email-hongyang.yang@easystack.cn> X-Mailer: git-send-email 1.8.3.1 X-HM-Spam-Status: e1koWUFPN1dZCBgUCR5ZQUhVQ0lCQkJCQklITEtNS05PTFdZCQ4XHghZQV koKz0kNTQ1PiQyNSQzPjo*PilBS1VLQDYjJCI#KCQyNSQzPjo*PilBS1VLQCsvKSQ1NCQyNSQzPj o*PilBS1VLQDg0LjUvKSIkODVBS1VLQCk#PDI0NSQ6KDI6QUtVS0ArKTQtMjU4PiQxMjo1PCguQU tVS0A*IjU6NjI4JDIrJDU0JDI1JDM#Oj8#KUFLVUtANi43LzIkKTgrLyQ*Mj09Pik#NS8kMjUkMz 46Pz4pQUlVS0AyKyRKJDYyNS4vPiQ4NS8kSyRKS0FLVUtAMiskSEskNjI1Li8#JDg1LyRLJE5LQU tVS0AyKyQvND86IiQ4NS8kSyRKS0tBS1VLQDIrJE4kNjI1Li8#JDg1LyRLJEpLQUtVS0AyKyRKJD M0LikkODUvJEskSktLQUtVS0AoLjkxPjgvJE4kNjI1Li8#JDg1LyRLJEpLQUtVS0AoLjkxPjgvJC 80PzoiJDg1LyRLJEpLS0FLVUtAKC45MT44LyRKJDM0LikkODUvJEskSktLQUtVS0A9NSQoLjkkPj UsNCk*KCQzNzEkSktLSUtKQUtVSUNAKC45JD5BSlVOTlkG X-HM-Sender-Digest: e1kSHx4VD1lBWUc6PBA6HBw*CzorCUtWLDQUNC4RESkaC0JVSlVKT01K S05KTkxOTklIVTMWGhIXVRMUFRwCGhUcVQIaFRw7HhoIAggPGhgQVRgVRVlXWQweGVlBHRoXCB5X WQgBWUFJSEhIN1dZEgtZQVlKQ0tVSktCVUpITVVNTFkG X-HM-Tid: 0a542d75cc4d64274cd2911056a3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.58.177.109 Subject: [Qemu-devel] [PATCH] qemu-ga: do not run qga test when guest agent disabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Roth , Paolo Bonzini , Gerd Hoffmann , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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)