From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THsCd-0004mL-Ld for qemu-devel@nongnu.org; Sat, 29 Sep 2012 04:15:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THsCb-0004jA-Hn for qemu-devel@nongnu.org; Sat, 29 Sep 2012 04:15:11 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:36248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THsCa-0004fa-Sy for qemu-devel@nongnu.org; Sat, 29 Sep 2012 04:15:09 -0400 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 29 Sep 2012 13:45:06 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q8T8F4aW33161238 for ; Sat, 29 Sep 2012 13:45:04 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q8T8F4q6030727 for ; Sat, 29 Sep 2012 18:15:04 +1000 From: Wenchao Xia Date: Sat, 29 Sep 2012 16:13:37 +0800 Message-Id: <1348906418-16471-5-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1348906418-16471-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1348906418-16471-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V5 4/5] libqblock test build system List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@gmail.com, blauwirbel@gmail.com, pbonzini@redhat.com, eblake@redhat.com, Wenchao Xia This patch added build system for testing libqblock, make check-libqblock will build and test it, make clean or make check-clean will delete generated binaries. Signed-off-by: Wenchao Xia --- .gitignore | 2 ++ Makefile | 2 +- tests/Makefile | 36 +++++++++++++++++++++++++++++++++++- tests/libqblock/libqblock-qcow2.c | 4 ++++ 4 files changed, 42 insertions(+), 2 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 f16ef99..49f9bb0 100644 --- a/Makefile +++ b/Makefile @@ -240,7 +240,7 @@ clean: rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp) rm -rf qapi-generated rm -rf qga/qapi-generated - $(MAKE) -C tests/tcg clean + $(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..3afb7b8 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -84,6 +84,22 @@ 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 test rules + +LIBQBLOCK_TEST_DIR=$(SRC_PATH)/tests/libqblock/test_images +LIBQBLOCK_DIR = libqblock +LIBQBLOCK_SO = $(LIBQBLOCK_DIR)/.libs/libqblock.so +LIBQBLOCK_SO_LINK_FLAG=-Wl,-rpath,$(LIBQBLOCK_DIR)/.libs + +tests/libqblock/%.o: QEMU_CFLAGS:=$(subst -fPIE,-fPIC, $(QEMU_CFLAGS)) +tests/libqblock/%.o: QEMU_CFLAGS:=$(subst -DPIE,-DPIC, $(QEMU_CFLAGS)) +tests/libqblock/%.o: QEMU_INCLUDES += -Itests -I$(LIBQBLOCK_DIR) + +check-libqblock-y = tests/libqblock/check-libqblock-qcow2$(EXESUF) + +tests/libqblock/check-libqblock-qcow2$(EXESUF): tests/libqblock/libqblock-qcow2.o $(LIBQBLOCK_SO) + $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(LIBQBLOCK_SO_LINK_FLAG)," LINK $@") + .PHONY: check-help check-help: @echo "Regression testing targets:" @@ -93,7 +109,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 +134,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) @@ -146,6 +169,17 @@ check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) check-unit: $(patsubst %,check-%, $(check-unit-y)) check-block: $(patsubst %,check-%, $(check-block-y)) -check: check-unit check-qtest +check-libqblock: $(patsubst %,check-%, $(check-libqblock-y)) +check: check-unit check-qtest check-libqblock + +check-clean: + $(MAKE) -C tests/tcg clean + rm -f $(check-unit-y) + rm -f $(check-qtest-i386-y) $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) + rm -f tests/*.o + rm -f tests/libqblock/*.o + rm -f $(check-libqblock-y) + rm -rf $(LIBQBLOCK_TEST_DIR) + -include $(wildcard tests/*.d) diff --git a/tests/libqblock/libqblock-qcow2.c b/tests/libqblock/libqblock-qcow2.c new file mode 100644 index 0000000..58fe692 --- /dev/null +++ b/tests/libqblock/libqblock-qcow2.c @@ -0,0 +1,4 @@ +int main(void) +{ + return 0; +} -- 1.7.1