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=664a2599b85f0409507e1bfc1b8bd3ced2a611a8 commit 664a2599b85f0409507e1bfc1b8bd3ced2a611a8 Author: Guillem Jover <[email protected]> AuthorDate: Fri Dec 10 15:47:36 2021 +0100 build: Fold autotest test suite machinery into src/ from src/at/ This matches how we are driving the test suites in other parts of the project, and reduces one level of directory recursion. --- build-aux/autotest.am | 20 ++++++++++---------- configure.ac | 1 - src/Makefile.am | 31 ++++++++++++++++++++++++------- src/at/Makefile.am | 26 -------------------------- 4 files changed, 34 insertions(+), 44 deletions(-) diff --git a/build-aux/autotest.am b/build-aux/autotest.am index c1135e26b..a4bb8ea54 100644 --- a/build-aux/autotest.am +++ b/build-aux/autotest.am @@ -1,11 +1,11 @@ -EXTRA_DIST += $(srcdir)/package.m4 +EXTRA_DIST += $(srcdir)/at/package.m4 -DISTCLEANFILES += atconfig +DISTCLEANFILES += at/atconfig -AUTOTEST_DEPS = atconfig atlocal $(TESTSUITE) +AUTOTEST_DEPS = at/atconfig at/atlocal $(TESTSUITE) # The ":;" works around a Bash 3.2 bug when the output is not writable. -$(srcdir)/package.m4: $(top_srcdir)/configure.ac +$(srcdir)/at/package.m4: $(top_srcdir)/configure.ac :;{ \ echo '# Signature of the current package.' && \ echo 'm4_define([AT_PACKAGE_NAME], [$(PACKAGE_NAME)])' && \ @@ -14,18 +14,18 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac 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' + } >'$(srcdir)/at/package.m4' autotest-check: $(AUTOTEST_DEPS) - $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) + $(SHELL) '$(TESTSUITE)' -C at $(TESTSUITEFLAGS) autotest-installcheck: $(AUTOTEST_DEPS) - $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' $(TESTSUITEFLAGS) + $(SHELL) '$(TESTSUITE)' -C at AUTOTEST_PATH='$(bindir)' $(TESTSUITEFLAGS) autotest-clean: - test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' --clean + test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C at --clean AUTOTEST = $(AUTOM4TE) --language=autotest -$(TESTSUITE): $(srcdir)/package.m4 $(TESTSUITE_AT) - $(AUTOTEST) -I '$(srcdir)' -o [email protected] [email protected] +$(TESTSUITE): $(srcdir)/at/package.m4 $(TESTSUITE_AT) + $(AUTOTEST) -I '$(srcdir)/at' -o [email protected] [email protected] mv [email protected] $@ diff --git a/configure.ac b/configure.ac index 403c24303..1dd8d7870 100644 --- a/configure.ac +++ b/configure.ac @@ -245,7 +245,6 @@ AC_CONFIG_FILES([ scripts/mk/Makefile scripts/po/Makefile.in src/Makefile - src/at/Makefile src/at/atlocal utils/Makefile ]) diff --git a/src/Makefile.am b/src/Makefile.am index 006592fbe..ddb732bb2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,10 +1,5 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = \ - . \ - at \ - # EOL - AM_CPPFLAGS = \ -DLOCALEDIR=\"$(localedir)\" \ -DADMINDIR=\"$(admindir)\" \ @@ -21,6 +16,8 @@ LDADD = \ EXTRA_DIST = +DISTCLEANFILES = + bin_PROGRAMS = \ dpkg \ dpkg-deb \ @@ -134,6 +131,26 @@ EXTRA_DIST += $(test_scripts) include $(top_srcdir)/build-aux/tap.am -check-local: tap-check +EXTRA_DIST += $(srcdir)/at/atlocal.in +EXTRA_DIST += $(srcdir)/at/package.m4 + +TESTSUITE_AT = $(srcdir)/at/testsuite.at +TESTSUITE_AT += $(srcdir)/at/local.at +TESTSUITE_AT += $(srcdir)/at/deb-format.at +TESTSUITE_AT += $(srcdir)/at/deb-fields.at +TESTSUITE_AT += $(srcdir)/at/deb-content.at +TESTSUITE_AT += $(srcdir)/at/deb-split.at +EXTRA_DIST += $(TESTSUITE_AT) + +TESTSUITE = $(srcdir)/at/testsuite +EXTRA_DIST += $(TESTSUITE) + +DISTCLEANFILES += at/atconfig + +include $(top_srcdir)/build-aux/autotest.am + +check-local: tap-check autotest-check + +installcheck-local: autotest-installcheck -clean-local: tap-clean +clean-local: tap-clean autotest-clean diff --git a/src/at/Makefile.am b/src/at/Makefile.am deleted file mode 100644 index 3e898aefa..000000000 --- a/src/at/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## 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 = - -include $(top_srcdir)/build-aux/autotest.am - -check-local: autotest-check - -installcheck-local: autotest-installcheck - -clean-local: autotest-clean -- Dpkg.Org's dpkg
