[Reproducible-commits] [dpkg] 11/32: build: Set PERL5LIB globally for the test suite to the local modules directory

[Jérémy Bobbio]

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 f02217095bb294ab1eac879e495ffa23398ff7b6
Author: Guillem Jover <guillem at debian.org>
Date:   Fri Oct 9 16:55:35 2015 +0200

    build: Set PERL5LIB globally for the test suite to the local modules directory
    
    Regression introduced in commit 34b26c7db232b300991df5fb6f52707b381df28f.
    
    Some functional tests are passing through makefile and exec barriers,
    where the lib parameter for TAP::Harness is lost. Reintroduce the
    explicit global setting of PERL5LIB so that it gets inherited for all
    subprocesses.
    
    Closes: #801329
    Reported-by: Jérémy Bobbio <lunar at debian.org>
    Stable-Candidate: 1.17.x
---
 Makefile.am      | 1 -
 check.am         | 1 +
 debian/changelog | 4 ++++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 3d979b9..78c558f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -156,7 +156,6 @@ test_data = \
 # while changing dir to source dir on out-of-tree builds.
 TEST_ENV_VARS = \
 	DPKG_DATADIR=$(abs_top_srcdir) \
-	PERL5LIB=$(abs_top_srcdir)/scripts:$(abs_top_srcdir)/dselect/methods \
 	$(nil)
 
 include $(top_srcdir)/check.am
diff --git a/check.am b/check.am
index 837a76b..7d0d719 100644
--- a/check.am
+++ b/check.am
@@ -31,6 +31,7 @@ check-local: $(test_data) $(test_programs) $(test_scripts)
 	  srcdir=$(srcdir) builddir=$(builddir) \
 	  CC=$(CC) \
 	  PERL_DL_NONLAZY=1 \
+	  PERL5LIB=$(abs_top_srcdir)/scripts:$(abs_top_srcdir)/dselect/methods \
 	  PERL5OPT=$(TEST_COVERAGE) \
 	  $(PERL) -MTAP::Harness -e $(TEST_RUNNER) \
 	    $(addprefix $(builddir)/,$(test_programs)) \
diff --git a/debian/changelog b/debian/changelog
index c7a1c06..52ec913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ dpkg (1.18.4) UNRELEASED; urgency=low
   * Switch dpkg-scansources and dpkg-scanpackages to use File::Find instead
     of find(1), as the former is more portable with more consistent behavior,
     and always canonicalizes the pathnames. Closes: #800649
+  * Build system:
+    - Set PERL5LIB globally for the test suite to the local modules directory,
+      to avoid using the system modules. Regression introduced in dpkg 1.17.8.
+      Reported by Jérémy Bobbio <lunar at debian.org>. Closes: #801329
   * Documentation:
     - Move description for “target architecture” from the dpkg-architecture(1)
       ‘-A’ option to the TERMS section. Closes: #799046

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