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=527ebf510a93f96e7176250fee75094fc981316a commit 527ebf510a93f96e7176250fee75094fc981316a Author: Guillem Jover <guil...@debian.org> AuthorDate: Fri Dec 10 15:46:33 2021 +0100 build: Refactor autotest machinery into an automake include file --- src/at/Makefile.am => build-aux/autotest.am | 23 +++-------------- src/at/Makefile.am | 38 +++++++---------------------- 2 files changed, 13 insertions(+), 48 deletions(-) diff --git a/src/at/Makefile.am b/build-aux/autotest.am similarity index 66% copy from src/at/Makefile.am copy to build-aux/autotest.am index 3100d1d8f..c1135e26b 100644 --- a/src/at/Makefile.am +++ b/build-aux/autotest.am @@ -1,21 +1,6 @@ -## Process this file with automake to produce Makefile.in - -EXTRA_DIST = - EXTRA_DIST += $(srcdir)/package.m4 -TESTSUITE_AT = $(srcdir)/testsuite.at -TESTSUITE_AT += $(srcdir)/local.at -TESTSUITE_AT += $(srcdir)/deb-format.at -TESTSUITE_AT += $(srcdir)/deb-fields.at -TESTSUITE_AT += $(srcdir)/deb-content.at -TESTSUITE_AT += $(srcdir)/deb-split.at -EXTRA_DIST += $(TESTSUITE_AT) - -TESTSUITE = $(srcdir)/testsuite -EXTRA_DIST += $(TESTSUITE) - -DISTCLEANFILES = atconfig +DISTCLEANFILES += atconfig AUTOTEST_DEPS = atconfig atlocal $(TESTSUITE) @@ -31,13 +16,13 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \ } >'$(srcdir)/package.m4' -check-local: $(AUTOTEST_DEPS) +autotest-check: $(AUTOTEST_DEPS) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) -installcheck-local: $(AUTOTEST_DEPS) +autotest-installcheck: $(AUTOTEST_DEPS) $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' $(TESTSUITEFLAGS) -clean-local: +autotest-clean: test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' --clean AUTOTEST = $(AUTOM4TE) --language=autotest diff --git a/src/at/Makefile.am b/src/at/Makefile.am index 3100d1d8f..3e898aefa 100644 --- a/src/at/Makefile.am +++ b/src/at/Makefile.am @@ -15,32 +15,12 @@ EXTRA_DIST += $(TESTSUITE_AT) TESTSUITE = $(srcdir)/testsuite EXTRA_DIST += $(TESTSUITE) -DISTCLEANFILES = atconfig - -AUTOTEST_DEPS = atconfig atlocal $(TESTSUITE) - -# The ":;" works around a Bash 3.2 bug when the output is not writable. -$(srcdir)/package.m4: $(top_srcdir)/configure.ac - :;{ \ - echo '# Signature of the current package.' && \ - echo 'm4_define([AT_PACKAGE_NAME], [$(PACKAGE_NAME)])' && \ - echo 'm4_define([AT_PACKAGE_TARNAME], [$(PACKAGE_TARNAME)])' && \ - echo 'm4_define([AT_PACKAGE_VERSION], [$(PACKAGE_VERSION)])' && \ - echo 'm4_define([AT_PACKAGE_STRING], [$(PACKAGE_STRING)])' && \ - echo 'm4_define([AT_PACKAGE_URL], [$(PACKAGE_URL)])' && \ - echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \ - } >'$(srcdir)/package.m4' - -check-local: $(AUTOTEST_DEPS) - $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) - -installcheck-local: $(AUTOTEST_DEPS) - $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' $(TESTSUITEFLAGS) - -clean-local: - test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' --clean - -AUTOTEST = $(AUTOM4TE) --language=autotest -$(TESTSUITE): $(srcdir)/package.m4 $(TESTSUITE_AT) - $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at - mv $@.tmp $@ +DISTCLEANFILES = + +include $(top_srcdir)/build-aux/autotest.am + +check-local: autotest-check + +installcheck-local: autotest-installcheck + +clean-local: autotest-clean -- Dpkg.Org's dpkg
