From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bnBHG-0002lj-6A for qemu-devel@nongnu.org; Thu, 22 Sep 2016 17:11:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bnBH9-0001Ze-VD for qemu-devel@nongnu.org; Thu, 22 Sep 2016 17:11:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bnBH9-0001ZP-LU for qemu-devel@nongnu.org; Thu, 22 Sep 2016 17:11:23 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Fri, 23 Sep 2016 01:11:16 +0400 Message-Id: <20160922211116.32417-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2] build-sys: generate tests/.gitignore List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: eblake@redhat.com, peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= It's too easy to forget about updating the .gitignore, so this is an attempt at generating it instead. This approach assumes that the files to clean are the one to put in the .gitignore. Signed-off-by: Marc-Andr=C3=A9 Lureau --- v2: - fix make check-clean - improve adding $(QEMU_IOTESTS_HELPERS-y) in cleanfiles (it needs a pat= subst because tests/ is present 2 times) - use quiet-command - fix cleanfiles +=3D tests/Makefile.include | 26 +++++++++++++--- tests/.gitignore | 82 --------------------------------------------= ------ 2 files changed, 22 insertions(+), 86 deletions(-) delete mode 100644 tests/.gitignore diff --git a/tests/Makefile.include b/tests/Makefile.include index 6052a38..cf81fd7 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -782,8 +782,21 @@ $(patsubst %, check-%, $(check-qapi-schema-y)): chec= k-%.json: $(SRC_PATH)/%.json @perl -p -e 's|\Q$(SRC_PATH)\E/||g' $*.test.err | diff -q $(SRC_PATH)/$= *.err - @diff -q $(SRC_PATH)/$*.exit $*.test.exit =20 -# Consolidated targets +tests-cleanfiles =3D *.o +tests-cleanfiles +=3D .gitignore +tests-cleanfiles +=3D qht-bench$(EXESUF) +tests-cleanfiles +=3D qapi-schema/*.test.* +tests-cleanfiles +=3D test-qapi-event.[ch] +tests-cleanfiles +=3D test-qapi-types.[ch] +tests-cleanfiles +=3D test-qapi-visit.[ch] +tests-cleanfiles +=3D test-qmp-introspect.[ch] +tests-cleanfiles +=3D test-qmp-commands.h +tests-cleanfiles +=3D test-qmp-marshal.c +tests-cleanfiles +=3D $(subst tests/,,$(check-unit-y)) +tests-cleanfiles +=3D $(subst tests/,,$(check-qtest-y)) +tests-cleanfiles +=3D $(patsubst tests/%,%,$(QEMU_IOTESTS_HELPERS-y)) =20 +# Consolidated targets .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)) @@ -792,14 +805,19 @@ 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) tests/*.o $(QEMU_IOTESTS_HELPERS-y) - rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(t= arget)-y)) $(check-qtest-generic-y)) - + (cd tests && rm -rf $(tests-cleanfiles)) clean: check-clean =20 # Build the help program automatically =20 all: $(QEMU_IOTESTS_HELPERS-y) =20 +ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGO= ALS),,fail)) +$(SRC_PATH)/tests/.gitignore: + $(call quiet-command, echo "$(tests-cleanfiles)" | xargs -n1 | sort > $= @, \ + " GEN $(@F)") +Makefile: $(SRC_PATH)/tests/.gitignore +endif + -include $(wildcard tests/*.d) -include $(wildcard tests/libqos/*.d) diff --git a/tests/.gitignore b/tests/.gitignore deleted file mode 100644 index b4a9cfc..0000000 --- a/tests/.gitignore +++ /dev/null @@ -1,82 +0,0 @@ -check-qdict -check-qfloat -check-qint -check-qjson -check-qlist -check-qnull -check-qstring -check-qom-interface -check-qom-proplist -qht-bench -rcutorture -test-aio -test-base64 -test-bitops -test-blockjob-txn -test-clone-visitor -test-coroutine -test-crypto-afsplit -test-crypto-block -test-crypto-cipher -test-crypto-hash -test-crypto-ivgen -test-crypto-pbkdf -test-crypto-secret -test-crypto-tlscredsx509 -test-crypto-tlscredsx509-work/ -test-crypto-tlscredsx509-certs/ -test-crypto-tlssession -test-crypto-tlssession-work/ -test-crypto-tlssession-client/ -test-crypto-tlssession-server/ -test-crypto-xts -test-cutils -test-hbitmap -test-int128 -test-iov -test-io-channel-buffer -test-io-channel-command -test-io-channel-command.fifo -test-io-channel-file -test-io-channel-file.txt -test-io-channel-socket -test-io-channel-tls -test-io-task -test-logging -test-mul64 -test-opts-visitor -test-qapi-event.[ch] -test-qapi-types.[ch] -test-qapi-visit.[ch] -test-qdev-global-props -test-qemu-opts -test-qdist -test-qga -test-qht -test-qht-par -test-qmp-commands -test-qmp-commands.h -test-qmp-event -test-qmp-input-strict -test-qmp-input-visitor -test-qmp-introspect.[ch] -test-qmp-marshal.c -test-qmp-output-visitor -test-rcu-list -test-replication -test-rfifolock -test-string-input-visitor -test-string-output-visitor -test-thread-pool -test-throttle -test-timed-average -test-visitor-serialization -test-vmstate -test-write-threshold -test-x86-cpuid -test-xbzrle -test-netfilter -test-filter-mirror -test-filter-redirector -*-test -qapi-schema/*.test.* --=20 2.10.0