From patchwork Thu Sep 26 00:42:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 278052 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 36E442C00A4 for ; Thu, 26 Sep 2013 10:44:57 +1000 (EST) Received: from localhost ([::1]:55594 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOzhP-0003bn-5M for incoming@patchwork.ozlabs.org; Wed, 25 Sep 2013 20:44:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOzfy-0001vB-UN for qemu-devel@nongnu.org; Wed, 25 Sep 2013 20:43:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOzfh-0000lL-VI for qemu-devel@nongnu.org; Wed, 25 Sep 2013 20:43:26 -0400 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:38946) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOzfh-0000l0-9V for qemu-devel@nongnu.org; Wed, 25 Sep 2013 20:43:09 -0400 Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Sep 2013 06:13:05 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp02.in.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 26 Sep 2013 06:13:04 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 1E858E0055 for ; Thu, 26 Sep 2013 06:14:08 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r8Q0jHTC38469840 for ; Thu, 26 Sep 2013 06:15:18 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r8Q0h0Bi011066 for ; Thu, 26 Sep 2013 06:13:01 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r8Q0gwHx010992; Thu, 26 Sep 2013 06:12:59 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 26 Sep 2013 08:42:55 +0800 Message-Id: <1380156176-8551-2-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1380156176-8551-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1380156176-8551-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13092600-5816-0000-0000-00000A14A876 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.2 Cc: kwolf@redhat.com, pbonzini@redhat.com, mjt@tls.msk.ru, Wenchao Xia , stefanha@gmail.com Subject: [Qemu-devel] [PATCH V2 1/2] tests: build the helper program by default X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Usually we may configure and make, then goto ./tests/qemu-iotest, check. In this case an error will happen since helper program was not built. This patch simply build it by default. A better way may be introducing Makefile in ./tests/qemu-iotest, but it is more complicate to handle out of tree case, and a bit overkill for a single file now, we can do that when more files come. Signed-off-by: Wenchao Xia --- tests/Makefile | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 994fef1..5f2894f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -252,8 +252,10 @@ check-report.html: check-report.xml # Other tests +QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF) + .PHONY: check-tests/qemu-iotests-quick.sh -check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) tests/qemu-iotests/socket_scm_helper$(EXESUF) +check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) $< .PHONY: check-tests/test-qapi.py @@ -275,5 +277,9 @@ check-unit: $(patsubst %,check-%, $(check-unit-y)) check-block: $(patsubst %,check-%, $(check-block-y)) check: check-qapi-schema check-unit check-qtest +# Build the help program automatically + +all: $(QEMU_IOTESTS_HELPERS-y) + -include $(wildcard tests/*.d) -include $(wildcard tests/libqos/*.d)