[Reproducible-commits] [dpkg] 29/32: Get reference values from current modules in scripts/t/mk.t

Jérémy Bobbio lunar at moszumanska.debian.org
Fri Nov 6 14:02:23 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 d9d191fda34546a7601b6e5b319ee4b1d17d78ad
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Oct 8 16:14:10 2015 +0000

    Get reference values from current modules in scripts/t/mk.t
    
    scripts/t/mk.t will compute its reference values by shelling out to
    scripts/dpkg-architecture.pl and scripts/dpkg-buildflags.pl.
    These scripts will read some information from Perl modules. So we
    set PERL5LIB to the directory where the current source code lies.
    Otherwise, it means we use the currently installed module to retrieve
    the reference values, which would make the tests fail as soon as
    a new version changes the default values.
---
 scripts/t/mk.t | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/t/mk.t b/scripts/t/mk.t
index 04f88a7..afe3efe 100644
--- a/scripts/t/mk.t
+++ b/scripts/t/mk.t
@@ -29,6 +29,8 @@ my $datadir = "$srcdir/t/mk";
 # Turn these into absolute names so that we can safely switch to the test
 # directory with «make -C».
 $ENV{$_} = rel2abs($ENV{$_}) foreach qw(srcdir DPKG_DATADIR DPKG_ORIGINS_DIR);
+# We want the script that we will call to use the in-development modules
+$ENV{PERL5LIB} = rel2abs($srcdir);
 
 # Delete variables that can affect the tests.
 delete $ENV{$_} foreach grep { m/^DEB_/ } keys %ENV;

-- 
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