This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=c3f8bca7e6cf4d75ca94dc4b92c9d7f63d23775f commit c3f8bca7e6cf4d75ca94dc4b92c9d7f63d23775f Author: Guillem Jover <[email protected]> AuthorDate: Wed Aug 8 11:11:44 2018 +0200 debian: Enable verbose test suite only in non-terse builds --- debian/changelog | 1 + debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a925929d5..b129c07a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -199,6 +199,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - Do not pass VERBOSE to test suite, as we are not using any automake test driver, so it does not get honored. - Rename maintainer-build DEB_BUILD_OPTIONS to new standardized terse. + - Enable verbose test suite only in non-terse builds. * Test suite: - Skip Dpkg::OpenPGP test if gpg is not present. - Check POD in all perl scripts. diff --git a/debian/rules b/debian/rules index 49812fdd2..09dc6e65e 100755 --- a/debian/rules +++ b/debian/rules @@ -35,6 +35,7 @@ ifeq ($(DEB_HOST_ARCH_OS),linux) endif ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS))) confflags += --disable-silent-rules + testflags += TESTSUITEFLAGS=--verbose endif # Enable parallel test suite @@ -83,8 +84,7 @@ check: build dh_testdir ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - cd build-tree && $(MAKE) TESTSUITEFLAGS=--verbose \ - TEST_PARALLEL=$(NUMJOBS) check + cd build-tree && $(MAKE) $(testflags) TEST_PARALLEL=$(NUMJOBS) check endif # Install the package underneath debian/tmp -- Dpkg.Org's dpkg
