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=1b9cabecf24bd9fb51da80e4bf3f917800a31e20

commit 1b9cabecf24bd9fb51da80e4bf3f917800a31e20
Author: Guillem Jover <guil...@debian.org>
AuthorDate: Wed Jan 5 17:36:43 2022 +0100

    debian: Make TESTSUITEFLAGS extensible
    
    Set TESTSUITEFLAGS values and then assign that into the same environment
    variable in testflags. Move TEST_PARALLEL to testflags.
    
    This will allow to add multiple options to TESTSUITEFLAGS.
---
 debian/rules | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 263d6a85e..f0f33f003 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
        confflags += --with-libselinux
 endif
 ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
-       testflags += TESTSUITEFLAGS=--verbose
+       TESTSUITEFLAGS += --verbose
 endif
 
 # Enable parallel test suite
@@ -35,6 +35,8 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
   NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 
+testflags = TESTSUITEFLAGS=$(TESTSUITEFLAGS) TEST_PARALLEL=$(NUMJOBS)
+
 D := $(CURDIR)/debian/tmp
 
 %:
@@ -60,7 +62,7 @@ execute_after_dh_auto_install:
           $(D)/usr/share/lintian/profiles/dpkg/main.profile
 
 override_dh_auto_test:
-       dh_auto_test -- $(testflags) TEST_PARALLEL=$(NUMJOBS)
+       dh_auto_test -- $(testflags)
 
 override_dh_installsystemd:
        dh_installsystemd -a --name=dpkg-db-backup

-- 
Dpkg.Org's dpkg

Reply via email to