From patchwork Wed Jan 23 11:18:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 214897 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 71EA12C007C for ; Wed, 23 Jan 2013 22:46:50 +1100 (EST) Received: from localhost ([::1]:54707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxyPN-0001l7-6F for incoming@patchwork.ozlabs.org; Wed, 23 Jan 2013 06:22:21 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxyOV-0000HU-7U for qemu-devel@nongnu.org; Wed, 23 Jan 2013 06:21:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TxyOR-0007bR-KF for qemu-devel@nongnu.org; Wed, 23 Jan 2013 06:21:27 -0500 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:56721) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxyOR-0007b4-0E for qemu-devel@nongnu.org; Wed, 23 Jan 2013 06:21:23 -0500 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 23 Jan 2013 16:49:07 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp08.in.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 23 Jan 2013 16:49:04 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 08F40394004D for ; Wed, 23 Jan 2013 16:51:17 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r0NBLERL43450600 for ; Wed, 23 Jan 2013 16:51:14 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r0NBLGUV003173 for ; Wed, 23 Jan 2013 22:21:16 +1100 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.253]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r0NBIFec021779; Wed, 23 Jan 2013 22:21:14 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2013 19:18:06 +0800 Message-Id: <1358939887-22533-10-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1358939887-22533-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1358939887-22533-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13012311-2000-0000-0000-00000AB4509B X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.8 Cc: kwolf@redhat.com, pbonzini@redhat.com, aliguori@us.ibm.com, Wenchao Xia , stefanha@gmail.com Subject: [Qemu-devel] [PATCH V14 09/10] libqblock: build: add rules for test case 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 Libtool will be used for final link, the rules do nothing if libqblock was disabled. Temp directory was used to store image created in test, which will be deleted in clean. Signed-off-by: Wenchao Xia --- tests/Makefile | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 9a759a1..e5a47af 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -122,9 +122,19 @@ qtest-obj-y = tests/libqtest.o libqemuutil.a libqemustub.a qtest-obj-y += tests/libi2c.o tests/libi2c-omap.o $(check-qtest-y): $(qtest-obj-y) +#libqblock build rules + +LIBQBLOCK_LA = libqblock.la +LIBQBLOCK_TEST_DIR = tests/test_images +check-libqblock-$(CONFIG_LIBQBLOCK) = tests/check-libqblock-qcow2$(EXESUF) +$(check-libqblock-y): QEMU_INCLUDES += -I$(SRC_PATH)/tests -I$(SRC_PATH)/libqblock + +$(check-libqblock-y): %$(EXESUF): %.o $(LIBQBLOCK_LA) + $(call LINK, $^) + #clean rules -CHECK_CLEAN_TARGETS=$(check-unit-y) $(check-qtest-i386-y) $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) tests/*.o +CHECK_CLEAN_TARGETS=$(check-unit-y) $(check-qtest-i386-y) $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) tests/*.o $(check-libqblock-y) $(LIBQBLOCK_TEST_DIR) SUBDIR_CLEAN_RULES+=check-clean .PHONY: check-help @@ -136,6 +146,7 @@ check-help: @echo " make check-qtest Run qtest tests" @echo " make check-unit Run qobject tests" @echo " make check-block Run block tests" + @echo " make check-libqblock Run libqblock tests" @echo " make check-report.html Generates an HTML test report" @echo " make check-clean Clean the tests" @echo @@ -180,9 +191,20 @@ $(patsubst %, check-report-qtest-%.xml, $(QTEST_TARGETS)): check-report-qtest-%. check-report-unit.xml: $(check-unit-y) $(call quiet-command,gtester -q $(GTESTER_OPTIONS) -o $@ -m=$(SPEED) $^, "GTESTER $@") +# gtester tests with libqblock + +check-report-libqblock-$(CONFIG_LIBQBLOCK) = check-report-libqblock.xml + +.PHONY: $(patsubst %, check-%, $(check-libqblock-y)) +$(patsubst %, check-%, $(check-libqblock-y)): check-%: % + $(call quiet-command, LIBQBLOCK_TEST_DIR=$(LIBQBLOCK_TEST_DIR) gtester $(GTESTER_OPTIONS) -m=$(SPEED) $*,"GTESTER $*") + +$(check-report-libqblock-y): $(check-libqblock-y) + $(call quiet-command,gtester -q $(GTESTER_OPTIONS) -o $@ -m=$(SPEED) $^, "GTESTER $@") + # Reports and overall runs -check-report.xml: $(patsubst %,check-report-qtest-%.xml, $(QTEST_TARGETS)) check-report-unit.xml +check-report.xml: $(patsubst %,check-report-qtest-%.xml, $(QTEST_TARGETS)) check-report-unit.xml $(check-report-libqblock-y) $(call quiet-command,$(SRC_PATH)/scripts/gtester-cat $^ > $@, " GEN $@") check-report.html: check-report.xml @@ -197,10 +219,11 @@ check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) # Consolidated targets -.PHONY: check-qtest check-unit check check-clean +.PHONY: check-qtest check-unit check-libqblock check check-clean check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) check-unit: $(patsubst %,check-%, $(check-unit-y)) check-block: $(patsubst %,check-%, $(check-block-y)) +check-libqblock: $(patsubst %,check-%, $(check-libqblock-y)) check: check-unit check-qtest check-clean: