diff options
| author | Guillem Jover <guillem@debian.org> | 2016-09-07 20:25:20 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2016-10-30 06:29:50 +0100 |
| commit | f59f70bdad94b50de14b2939101c91387188bac4 (patch) | |
| tree | ef41da5d8e34a40f3db93a5b1ed4f34191333414 /scripts/t | |
| parent | 44cfbc4b31de7d3dc3c6471aeaf21768b4dc015a (diff) | |
| download | dpkg-f59f70bdad94b50de14b2939101c91387188bac4.tar.gz | |
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.
Diffstat (limited to 'scripts/t')
| -rw-r--r-- | scripts/t/mk.t | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/t/mk.t b/scripts/t/mk.t index 90310bb06..62d6124ab 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); |