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=1e61d9416719b628ec0e93ced10fe4c1f38ef105 commit 1e61d9416719b628ec0e93ced10fe4c1f38ef105 (HEAD -> main) Author: Guillem Jover <[email protected]> AuthorDate: Tue Dec 7 02:11:43 2021 +0100 build: Move autotest suite under src/ These are all functional tests for the now unified contents under src/. --- Makefile.am | 1 - configure.ac | 6 +++--- src/Makefile.am | 4 ++++ {t-func => src/at}/.gitignore | 0 {t-func => src/at}/Makefile.am | 0 {t-func => src/at}/atlocal.in | 2 +- {t-func => src/at}/deb-content.at | 0 {t-func => src/at}/deb-fields.at | 0 {t-func => src/at}/deb-format.at | 0 {t-func => src/at}/deb-split.at | 0 {t-func => src/at}/local.at | 0 {t-func => src/at}/testsuite.at | 0 tests/README | 2 +- 13 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9b5801df2..c68452224 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ SUBDIRS = \ utils \ $(MAYBE_DSELECT) \ scripts \ - t-func \ po \ man \ # EOL diff --git a/configure.ac b/configure.ac index b3beeef75..025f7d713 100644 --- a/configure.ac +++ b/configure.ac @@ -224,13 +224,11 @@ DPKG_ARCHITECTURE AC_DEFINE([PACKAGE_RELEASE], [PACKAGE_VERSION " (" ARCHITECTURE ")"], [Define the project release information, version and architecture]) -AC_CONFIG_TESTDIR([t-func]) +AC_CONFIG_TESTDIR([src/at]) AM_MISSING_PROG([AUTOM4TE], [autom4te]) AC_CONFIG_FILES([ Makefile - t-func/Makefile - t-func/atlocal dselect/Makefile dselect/methods/Makefile dselect/po/Makefile.in @@ -248,6 +246,8 @@ AC_CONFIG_FILES([ scripts/mk/Makefile scripts/po/Makefile.in src/Makefile + src/at/Makefile + src/at/atlocal utils/Makefile ]) AC_CONFIG_HEADERS([config.h]) diff --git a/src/Makefile.am b/src/Makefile.am index 2b1d4d3ce..88f688230 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,9 @@ ## Process this file with automake to produce Makefile.in +SUBDIRS = \ + at \ + # EOL + AM_CPPFLAGS = \ -DLOCALEDIR=\"$(localedir)\" \ -DADMINDIR=\"$(admindir)\" \ diff --git a/t-func/.gitignore b/src/at/.gitignore similarity index 100% rename from t-func/.gitignore rename to src/at/.gitignore diff --git a/t-func/Makefile.am b/src/at/Makefile.am similarity index 100% rename from t-func/Makefile.am rename to src/at/Makefile.am diff --git a/t-func/atlocal.in b/src/at/atlocal.in similarity index 91% rename from t-func/atlocal.in rename to src/at/atlocal.in index 013aaac9c..b9aaa43d9 100644 --- a/t-func/atlocal.in +++ b/src/at/atlocal.in @@ -3,7 +3,7 @@ PATH="@abs_top_builddir@/src:@abs_top_builddir@/utils:$PATH" export PATH -TESTDATA="@abs_top_srcdir@/t-func" +TESTDATA="@abs_top_srcdir@/at" export TESTDATA SED=@SED@ diff --git a/t-func/deb-content.at b/src/at/deb-content.at similarity index 100% rename from t-func/deb-content.at rename to src/at/deb-content.at diff --git a/t-func/deb-fields.at b/src/at/deb-fields.at similarity index 100% rename from t-func/deb-fields.at rename to src/at/deb-fields.at diff --git a/t-func/deb-format.at b/src/at/deb-format.at similarity index 100% rename from t-func/deb-format.at rename to src/at/deb-format.at diff --git a/t-func/deb-split.at b/src/at/deb-split.at similarity index 100% rename from t-func/deb-split.at rename to src/at/deb-split.at diff --git a/t-func/local.at b/src/at/local.at similarity index 100% rename from t-func/local.at rename to src/at/local.at diff --git a/t-func/testsuite.at b/src/at/testsuite.at similarity index 100% rename from t-func/testsuite.at rename to src/at/testsuite.at diff --git a/tests/README b/tests/README index 1ef426d9e..fb7d0a8b9 100644 --- a/tests/README +++ b/tests/README @@ -51,5 +51,5 @@ we stumble over regressions, when adding new functionality, and as time permits for existing functionality. The idea is for this to progressively be integrated into the autotools -autotest suite under t-func/, and be run as part of “make check”. Some +autotest suite under src/at/, and be run as part of “make check”. Some changes to dpkg would need to be implemented first. -- Dpkg.Org's dpkg
