This command will package the clean operations in tests,
to make it easy to be extended. Now root Makefile simply calls
the command and do not care the details of it any more.
Signed-off-by: Wenchao Xia <xiaw...@linux.vnet.ibm.com>
---
Makefile | 1 -
tests/Makefile | 12 +++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 0d9099a..b2d7798 100644
--- a/Makefile
+++ b/Makefile
@@ -225,7 +225,6 @@ clean:
rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp)
rm -rf qapi-generated
rm -rf qga/qapi-generated
- $(MAKE) -C tests/tcg clean
for d in $(ALL_SUBDIRS); 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 c681ceb..a653532 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -134,6 +134,10 @@ 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)
+#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
+
.PHONY: check-help
check-help:
@echo "Regression testing targets:"
@@ -144,6 +148,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."
@@ -203,10 +208,15 @@ check-tests/qemu-iotests-quick.sh:
tests/qemu-iotests-quick.sh qemu-img$(EXESUF)
# Consolidated targets
-.PHONY: check-qtest check-unit check
+.PHONY: check-qtest check-unit 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: check-unit check-qtest
+check-clean:
+ $(MAKE) -C tests/tcg clean
+ rm -rf $(CHECK_CLEAN_TARGETS)
+
+clean: check-clean
-include $(wildcard tests/*.d)
--
1.7.1
