This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=0a4931080d7826ff91b933af1a5ec82a7636f9b5 commit 0a4931080d7826ff91b933af1a5ec82a7636f9b5 Author: Guillem Jover <[email protected]> AuthorDate: Fri Dec 10 15:21:31 2021 +0100 build: Rework TAP check hooking into the autotools machinery Rename the TAP automake support file to tap.am to make it explicit this is just one of the possible test suites we are running. Move from implicitly hooking into the autotools check machinery to explicitly hooking into it, so that we can run different test suites from the same directory. --- Makefile.am | 6 ++++-- build-aux/{check.am => tap.am} | 4 ++-- lib/dpkg/Makefile.am | 6 ++++-- scripts/Makefile.am | 6 ++++-- src/Makefile.am | 6 ++++-- utils/Makefile.am | 6 ++++-- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index c68452224..be1236840 100644 --- a/Makefile.am +++ b/Makefile.am @@ -198,7 +198,9 @@ TEST_ENV_VARS = \ DPKG_DATADIR=$(abs_top_srcdir)/data \ # EOL -include $(top_srcdir)/build-aux/check.am +include $(top_srcdir)/build-aux/tap.am + +check-local: tap-check .PHONY: update-po @@ -231,4 +233,4 @@ dist-hook: dist-cpan git log -C --stat 1.15.0.. >$(distdir)/ChangeLog; \ fi -clean-local: doc-clean coverage-clean check-clean +clean-local: doc-clean coverage-clean tap-clean diff --git a/build-aux/check.am b/build-aux/tap.am similarity index 95% rename from build-aux/check.am rename to build-aux/tap.am index c7d6731ce..7e600e567 100644 --- a/build-aux/check.am +++ b/build-aux/tap.am @@ -26,10 +26,10 @@ TEST_RUNNER = '\ my $$aggregate = $$harness->runtests(@ARGV); \ die "FAIL: test suite has errors\n" if $$aggregate->has_errors;' -check-clean: +tap-clean: [ -z "$(test_tmpdir)" ] || rm -fr $(test_tmpdir) -check-local: $(test_data) $(test_programs) $(test_scripts) +tap-check: $(test_data) $(test_programs) $(test_scripts) [ -z "$(test_tmpdir)" ] || $(MKDIR_P) $(test_tmpdir) PATH="$(abs_top_builddir)/src:$(abs_top_builddir)/scripts:$(abs_top_builddir)/utils:$(PATH)" \ LC_ALL=C \ diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index 1fa404687..1462f8ac9 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -245,6 +245,8 @@ TEST_ENV_VARS = \ test_tmpdir = t.tmp -include $(top_srcdir)/build-aux/check.am +include $(top_srcdir)/build-aux/tap.am -clean-local: check-clean +check-local: tap-check + +clean-local: tap-clean diff --git a/scripts/Makefile.am b/scripts/Makefile.am index b8d792563..bfca2a0c9 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -466,7 +466,9 @@ refresh-test-data: $(test_data_objects) >$(srcdir)/t/Dpkg_Shlibs/objdump.spacesyms $(OBJDUMP) `which ls` >$(srcdir)/t/Dpkg_Shlibs/objdump.ls -include $(top_srcdir)/build-aux/check.am +include $(top_srcdir)/build-aux/tap.am -clean-local: check-clean coverage-clean +check-local: tap-check + +clean-local: tap-clean coverage-clean rm -fr man diff --git a/src/Makefile.am b/src/Makefile.am index cac4c206b..a2a6fa1b6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -133,6 +133,8 @@ test_scripts = \ t/dpkg_divert.t \ # EOL -include $(top_srcdir)/build-aux/check.am +include $(top_srcdir)/build-aux/tap.am -clean-local: check-clean +check-local: tap-check + +clean-local: tap-clean diff --git a/utils/Makefile.am b/utils/Makefile.am index ebd9e450a..71873a5ce 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -96,6 +96,8 @@ test_scripts = \ t/update_alternatives.t \ # EOL -include $(top_srcdir)/build-aux/check.am +include $(top_srcdir)/build-aux/tap.am -clean-local: check-clean +check-local: tap-check + +clean-local: tap-clean -- Dpkg.Org's dpkg
