[pkg-perl-tools] 01/02: autopkgtest/smoke: add the test directory to @INC

Niko Tyni ntyni at moszumanska.debian.org
Fri Sep 2 09:18:03 UTC 2016


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

ntyni pushed a commit to branch master
in repository pkg-perl-tools.

commit fe96c9e0f8007b6bbd7f8ee49646588391c0cd4f
Author: Niko Tyni <ntyni at debian.org>
Date:   Fri Sep 2 11:52:37 2016 +0300

    autopkgtest/smoke: add the test directory to @INC
    
    As of perl 5.22.2-4, cwd is no longer on @INC. See
     https://lists.debian.org/debian-devel-announce/2016/08/msg00013.html
    for the background.
    
    A number of test suites do things like 'require "t/foo.pm"', which
    now fails. This has been worked around at build time by changes in
    debhelper and cdbs (see #832436 and #836110), for at least the stretch
    release cycle, so the autopkgtest checks need to follow suit.
    
    Adding cwd to @INC would risk masking real runtime functionality
    regressions that we want to catch, so we use just the absolute directory
    where the test suite is copied.
---
 autopkgtest/scripts/build-deps.d/smoke | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autopkgtest/scripts/build-deps.d/smoke b/autopkgtest/scripts/build-deps.d/smoke
index fe6ab65..822d91b 100755
--- a/autopkgtest/scripts/build-deps.d/smoke
+++ b/autopkgtest/scripts/build-deps.d/smoke
@@ -143,8 +143,8 @@ if [ -z "$test_targets" ] && [ -d t ]; then test_targets=$(ls -d t/*.t 2>/dev/nu
 if [ ! -n "$test_targets" ]; then
     echo 'Nothing to prove, skipping.'
 else
-    $XVFB prove --blib --verbose $PKG_PERL_PROVE_ARGS $test_targets 2>&1
+    $XVFB prove -I"$TDIR" --blib --verbose $PKG_PERL_PROVE_ARGS $test_targets 2>&1
 fi
 
-if [ -f test.pl ]; then $XVFB perl ./test.pl; fi 2>&1
+if [ -f test.pl ]; then $XVFB perl -I"$TDIR" ./test.pl; fi 2>&1
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pkg-perl-tools.git



More information about the Pkg-perl-cvs-commits mailing list