From patchwork Fri Nov 16 10:12:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 199529 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 565952C0081 for ; Fri, 16 Nov 2012 21:14:27 +1100 (EST) Received: from localhost ([::1]:32871 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZIwL-0000m3-Bx for incoming@patchwork.ozlabs.org; Fri, 16 Nov 2012 05:14:25 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZIw3-0000Xz-Sj for qemu-devel@nongnu.org; Fri, 16 Nov 2012 05:14:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TZIw0-0001Jz-OS for qemu-devel@nongnu.org; Fri, 16 Nov 2012 05:14:07 -0500 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:53736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZIw0-0001HL-7Q for qemu-devel@nongnu.org; Fri, 16 Nov 2012 05:14:04 -0500 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 16 Nov 2012 20:09:56 +1000 Received: from d23relay05.au.ibm.com (202.81.31.247) by e23smtp07.au.ibm.com (202.81.31.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 16 Nov 2012 20:09:54 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qAGA3Ole2818448 for ; Fri, 16 Nov 2012 21:03:24 +1100 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qAGADwdh013159 for ; Fri, 16 Nov 2012 21:13:58 +1100 Received: from RedHat62GAWSWenchao ([9.125.27.167]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qAGACNnt010442; Fri, 16 Nov 2012 21:13:55 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 16 Nov 2012 18:12:11 +0800 Message-Id: <1353060737-4244-3-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1353060737-4244-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1353060737-4244-1-git-send-email-xiawenc@linux.vnet.ibm.com> x-cbid: 12111610-0260-0000-0000-00000229EC05 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.140 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, stefanha@gmail.com, blauwirbel@gmail.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V9 2/8] Buildsystem clean tests directory clearly 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 Currently make clean only clean tests/tcg and hard to extend. This patch added command make check-clean, which clean all generated files used in tests. With this command root Makefile do not care tests clean method any more, it simply calls the command to do it, so any more clean script could be added in tests/Makefile make it easier to extend. Signed-off-by: Wenchao Xia --- Makefile | 2 +- configure | 2 +- tests/Makefile | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f40885b..8201e80 100644 --- a/Makefile +++ b/Makefile @@ -251,7 +251,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 + MAKEFILES=./tests/Makefile $(MAKE) check-clean for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \ if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ rm -f $$d/qemu-options.def; \ diff --git a/configure b/configure index f847ee2..a18e267 100755 --- a/configure +++ b/configure @@ -4163,7 +4163,7 @@ DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas" DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS qapi-generated" DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace" -FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" +FILES="Makefile tests/Makefile tests/tcg/Makefile qdict-test-data.txt" FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile" FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" diff --git a/tests/Makefile b/tests/Makefile index 9bf0765..a286622 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -94,6 +94,7 @@ check-help: @echo " make check-unit Run qobject tests" @echo " make check-block Run block tests" @echo " make check-report.html Generates an HTML test report" + @echo " make check-clean Clean the tests" @echo @echo "Please note that HTML reports do not regenerate if the unit tests" @echo "has not changed." @@ -148,4 +149,10 @@ check-unit: $(patsubst %,check-%, $(check-unit-y)) check-block: $(patsubst %,check-%, $(check-block-y)) check: check-unit check-qtest +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 + -include $(wildcard tests/*.d)