build: add command check-clean

This command will package the clean operations in tests. Now root Makefile
simply calls the command and do not care the details of it any more. Original
the built binaries for test will not be removed, now they will be deleted
in clean operation.

Signed-off-by: Wenchao Xia <[email protected]>
Reviewed-by: Fam Zheng <[email protected]>
Signed-off-by: Kevin Wolf <[email protected]>

diff --git a/Makefile b/Makefile
index 60fb87e2dd2683eeea6864ad1f02b2c86432d38b..b15003f9d21c47117431e8cc40d5c7c5e8f83a97 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -246,7 +246,6 @@ clean:
        rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp)
        rm -rf qapi-generated
        rm -rf qga/qapi-generated
        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; \
        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 6d67fdf9000029c0599ae67a67f252a310c7b3b5..fa4c9f0cbbf6bd60e81fe64d2616022341bbd893 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -196,6 +196,7 @@ check-help:
        @echo " make check-qapi-schema    Run QAPI schema tests"
        @echo " make check-block          Run block tests"
        @echo " make check-report.html    Generates an HTML test report"
        @echo " make check-qapi-schema    Run QAPI schema 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."
        @echo
        @echo "Please note that HTML reports do not regenerate if the unit tests"
        @echo "has not changed."


@@ -270,12 +271,17 @@ $(patsubst %, check-%, $(check-qapi-schema-y)): check-%.json: $(SRC_PATH)/%.json
 
 # Consolidated targets
 
 
 # Consolidated targets
 

-.PHONY: check-qapi-schema check-qtest check-unit check
+.PHONY: check-qapi-schema check-qtest check-unit check check-clean

 check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y))
 check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
 check-unit: $(patsubst %,check-%, $(check-unit-y))
 check-block: $(patsubst %,check-%, $(check-block-y))
 check: check-qapi-schema check-unit check-qtest
 check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y))
 check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
 check-unit: $(patsubst %,check-%, $(check-unit-y))
 check-block: $(patsubst %,check-%, $(check-block-y))
 check: check-qapi-schema check-unit check-qtest

+check-clean:
+       $(MAKE) -C tests/tcg clean
+       rm -rf $(check-unit-y) $(check-qtest-i386-y) $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
+
+clean: check-clean

 
 # Build the help program automatically
 
 
 # Build the help program automatically