[Reproducible-commits] [dpkg] 35/61: t: Filter out any environment variable starting with DEB_ in mk.t

Jérémy Bobbio lunar at moszumanska.debian.org
Mon Sep 21 09:57:17 UTC 2015


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

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit b83c018366b00a804b34598234b7df1bcdeec832
Author: Guillem Jover <guillem at debian.org>
Date:   Tue Sep 15 21:52:42 2015 +0200

    t: Filter out any environment variable starting with DEB_ in mk.t
    
    These might affect the test results, and make them fail.
---
 debian/changelog | 2 ++
 scripts/t/mk.t   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 60f9530..41b7bca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ dpkg (1.18.3) UNRELEASED; urgency=low
     - Get the reference build flags from dpkg-buildflags.pl, instead of
       hardcoding them, which might not match depending on the architecture.
       Closes: #794694
+    - Delete any environment variable starting with DEB_ in mk.t that might
+      affect the test results.
   * Build system:
     - Add a new --with-devlibdir configure option for the C libdpkg library.
   * Packaging:
diff --git a/scripts/t/mk.t b/scripts/t/mk.t
index 6be5a01..04f88a7 100644
--- a/scripts/t/mk.t
+++ b/scripts/t/mk.t
@@ -31,7 +31,7 @@ my $datadir = "$srcdir/t/mk";
 $ENV{$_} = rel2abs($ENV{$_}) foreach qw(srcdir DPKG_DATADIR DPKG_ORIGINS_DIR);
 
 # Delete variables that can affect the tests.
-delete $ENV{DEB_VENDOR};
+delete $ENV{$_} foreach grep { m/^DEB_/ } keys %ENV;
 
 sub test_makefile {
     my $makefile = shift;

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



More information about the Reproducible-commits mailing list