[dpkg] 127/187: test: Delete MAKEFLAGS when testing make invocations

[Reiner Herrmann]

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

deki-guest pushed a commit to branch master
in repository dpkg.

commit f59f70bdad94b50de14b2939101c91387188bac4
Author: Guillem Jover <guillem at debian.org>
Date:   Wed Sep 7 20:25:20 2016 +0200

    test: Delete MAKEFLAGS when testing make invocations
    
    If the parent has been called with -jN then the MAKEFLAGS will contain
    information to be used by the jobserver, but those file descriptors are
    closed in the way, and make complains.
    
    As we are testing the makefiles serially anyway, just remove the
    MAKEFLAGS to get rid of the warnings.
---
 debian/changelog | 1 +
 scripts/t/mk.t   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5ee6b9e..fd86bf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -151,6 +151,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
     - Add an initial functional test suite for dpkg-deb and dpkg-split.
     - Skip the involved tests if IO::String is missing.
     - Add new unit test for libdpkg error handling.
+    - Delete MAKEFLAGS environment variable when testing make invocations.
   * Build system:
     - Add support for profiling perl modules.
     - Clean up compiler and linker automatic flag usage in configure.
diff --git a/scripts/t/mk.t b/scripts/t/mk.t
index 90310bb..62d6124 100644
--- a/scripts/t/mk.t
+++ b/scripts/t/mk.t
@@ -31,7 +31,11 @@ my $datadir = "$srcdir/t/mk";
 # directory with «make -C».
 $ENV{$_} = rel2abs($ENV{$_}) foreach qw(srcdir DPKG_DATADIR DPKG_ORIGINS_DIR);
 
-# Delete variables that can affect the tests.
+# Any paralellization from the parent should be ignored, we are testing
+# the makefiles serially anyway.
+delete $ENV{MAKEFLAGS};
+
+# Delete other variables that can affect the tests.
 delete $ENV{$_} foreach grep { m/^DEB_/ } keys %ENV;
 
 $ENV{DEB_BUILD_PATH} = rel2abs($datadir);

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