From patchwork Thu Sep 27 02:24:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 187260 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 0BF062C00AC for ; Thu, 27 Sep 2012 12:25:11 +1000 (EST) Received: from localhost ([::1]:49479 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH3mn-0002p2-20 for incoming@patchwork.ozlabs.org; Wed, 26 Sep 2012 22:25:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH3mS-0002av-Dl for qemu-devel@nongnu.org; Wed, 26 Sep 2012 22:24:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TH3mR-0007xN-2A for qemu-devel@nongnu.org; Wed, 26 Sep 2012 22:24:48 -0400 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:41452) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH3mQ-0007x2-Df for qemu-devel@nongnu.org; Wed, 26 Sep 2012 22:24:46 -0400 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 27 Sep 2012 07:54:44 +0530 Received: from d28relay03.in.ibm.com (9.184.220.60) by e28smtp03.in.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 27 Sep 2012 07:54:42 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q8R2OfhP30801954 for ; Thu, 27 Sep 2012 07:54:41 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q8R2OfJ0032041 for ; Thu, 27 Sep 2012 12:24:41 +1000 Received: from RedHat62GAWSWenchao ([9.115.122.38]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q8R2O4n2030160; Thu, 27 Sep 2012 12:24:39 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 10:24:01 +0800 Message-Id: <1348712642-4427-5-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1348712642-4427-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1348712642-4427-1-git-send-email-xiawenc@linux.vnet.ibm.com> x-cbid: 12092702-3864-0000-0000-000004CF15DD X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 122.248.162.3 Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@gmail.com, blauwirbel@gmail.com, pbonzini@redhat.com, eblake@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V4 4/5] libqblock test build system 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 This patch will create a new directory in ./tests, make check-libqblock will build an executable binary, make clean or make check-clean will delete generated binaries. Signed-off-by: Wenchao Xia --- .gitignore | 2 + Makefile | 1 + tests/Makefile | 45 +++++++++++++++++++++++++++++++++++++ tests/libqblock/libqblock-qcow2.c | 4 +++ 4 files changed, 52 insertions(+), 0 deletions(-) create mode 100644 tests/libqblock/libqblock-qcow2.c diff --git a/.gitignore b/.gitignore index 824c0d2..080a88b 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,5 @@ cscope.* tags TAGS *~ +tests/libqblock/check-* +tests/libqblock/test_images diff --git a/Makefile b/Makefile index 128bc6a..7cfb555 100644 --- a/Makefile +++ b/Makefile @@ -237,6 +237,7 @@ clean: rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp) rm -rf qapi-generated rm -rf qga/qapi-generated + $(MAKE) check-clean for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard libqblock; do \ if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ rm -f $$d/qemu-options.def; \ diff --git a/tests/Makefile b/tests/Makefile index 26a67ce..668c825 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -84,6 +84,17 @@ check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET) qtest-obj-y = tests/libqtest.o $(oslib-obj-y) $(tools-obj-y) $(check-qtest-y): $(qtest-obj-y) +#libqblock +LIBQBLOCK_TEST_DIR=$(SRC_PATH)/tests/libqblock/test_images +qtest-lib-y=$(patsubst %.o, %.lo,$(qtest-obj-y)) +libqblock-la-path = $(libqblock-lib-path)/$(libqblock-lib-la) + +tests/libqblock/%.lo: QEMU_INCLUDES += -I$(libqblock-lib-path) -Itests + +check-libqblock-y = tests/libqblock/check-libqblock-qcow2$(EXESUF) +tests/libqblock/check-libqblock-qcow2$(EXESUF): tests/libqblock/libqblock-qcow2.lo $(libqblock-la-path) $(qtest-lib-y) + $(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -shared -rpath $(libdir) -o $@ $^," lt LINK $@") + .PHONY: check-help check-help: @echo "Regression testing targets:" @@ -93,7 +104,9 @@ 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 test" @echo @echo "Please note that HTML reports do not regenerate if the unit tests" @echo "has not changed." @@ -116,6 +129,11 @@ $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: $(check-qtest-y) $(patsubst %, check-%, $(check-unit-y)): check-%: % $(call quiet-command,gtester $(GTESTER_OPTIONS) -m=$(SPEED) $*,"GTESTER $*") +#libqblock tests +.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 $*") + # gtester tests with XML output $(patsubst %, check-report-qtest-%.xml, $(QTEST_TARGETS)): check-report-qtest-%.xml: $(check-qtest-y) @@ -148,4 +166,31 @@ check-unit: $(patsubst %,check-%, $(check-unit-y)) check-block: $(patsubst %,check-%, $(check-block-y)) check: check-unit check-qtest +ifeq ($(LIBTOOL),) +check-libqblock: + @echo "libtool is missing, skip libqblock test." +else +$(libqblock-la-path): + @echo "Building libqblock.la..." + $(call quiet-command,$(MAKE) -C $(SRC_PATH) $(libqblock-lib-la),) +$(LIBQBLOCK_TEST_DIR): + @echo "Make libqblock test directory" + mkdir $(LIBQBLOCK_TEST_DIR) + +check-libqblock: $(libqblock-la-path) $(LIBQBLOCK_TEST_DIR) $(patsubst %,check-%, $(check-libqblock-y)) +endif + +check-clean: + $(MAKE) -C tests/tcg clean + rm -f tests/*.lo tests/*.o + rm -rf tests/.libs + rm -f tests/libqblock/*.lo tests/libqblock/*.o + rm -rf tests/libqblock/.libs + rm -f trace/*.lo trace/*.o + rm -rf trace/.libs + rm -f $(check-libqblock-y) + rm -rf $(LIBQBLOCK_TEST_DIR) + rm -f $(check-unit-y) + rm -f $(check-qtest-i386-y) $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) + -include $(wildcard tests/*.d) diff --git a/tests/libqblock/libqblock-qcow2.c b/tests/libqblock/libqblock-qcow2.c new file mode 100644 index 0000000..c05c0c4 --- /dev/null +++ b/tests/libqblock/libqblock-qcow2.c @@ -0,0 +1,4 @@ +int main(int argc, char **argv) +{ + return 0; +}