From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZJ5g-0007QH-8P for qemu-devel@nongnu.org; Fri, 16 Nov 2012 05:24:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TZJ5d-0003rP-6T for qemu-devel@nongnu.org; Fri, 16 Nov 2012 05:24:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZJ5c-0003rJ-Uq for qemu-devel@nongnu.org; Fri, 16 Nov 2012 05:24:01 -0500 Message-ID: <50A6143A.4080901@redhat.com> Date: Fri, 16 Nov 2012 11:23:54 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1353042317-13688-1-git-send-email-xiawenc@linux.vnet.ibm.com> <1353042317-13688-3-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1353042317-13688-3-git-send-email-xiawenc@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/2] Buildsystem clean tests directory clearly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wenchao Xia Cc: kwolf@redhat.com, stefanha@gmail.com, aliguori@us.ibm.com, qemu-devel@nongnu.org, blauwirbel@gmail.com Il 16/11/2012 06:05, Wenchao Xia ha scritto: > 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 What is MAKEFILES? Paolo > 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) >