[debhelper-devel] [debhelper] 01/02: d/rules: --no-parallel is only needed for dh_auto_test

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 57ed67d383ed0b948b3465dc20ccfde2f3507834
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Apr 10 19:53:32 2017 +0000

    d/rules: --no-parallel is only needed for dh_auto_test
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 2 ++
 debian/rules     | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 313bd3f..50dc4ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ debhelper (10.3) UNRELEASED; urgency=medium
     likely to be confused with --no-restart-after-upgrade and is more
     descriptive of what it actually does.  Thanks to  Simon McVittie and
     Michael Biebl for the help.  (Closes: #837528)
+  * debian/rules: Only apply the --no-parallel to dh_auto_test.  The rest
+    of debhelper's build appears to work fine with --parallel.
 
   [ Steven Chamberlain ]
   * When cross-compiling for GNU/kFreeBSD host systems, set
diff --git a/debian/rules b/debian/rules
index 9ca8b94..12aa825 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,15 @@
 # to ensure that the commands and libraries in the source tree are used,
 # rather than the installed ones.
 #
-# We use --no-parallel because the test suite is not thread safe.
 # We disable autoreconf to avoid build-depending on it (it does
 # nothing for debhelper and it keeps the set of B-D smaller)
 
 %:
-	./run dh $@ --no-parallel --without autoreconf --with build-stamp
+	./run dh $@ --without autoreconf --with build-stamp
+
+# The tests fail when run in parallel
+override_dh_auto_test:
+	./run dh_auto_test --no-parallel
 
 # Disable as they are unneeded (and we can then be sure debhelper
 # builds without needing autotools-dev, dh-strip-nondetermism etc.)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git