This is an automated email from the git hooks/post-receive script. fsfs pushed a commit to branch master in repository libmodule-build-perl.
commit 85f6f72241414080d8950834cb496e1fe0a3239d Author: Niko Tyni <nt...@debian.org> Date: Fri Sep 19 00:00:51 2014 +0300 Allow loading from system path when running under autopkgtest When re-using the build time test suite as a runtime as-installed one, we explicitly want to load Module::Build from the system paths. This situation is detected by the ADTTMP environment variable, set by the autopkgtest tool. See http://dep.debian.net/deps/dep8/ Rewiring check_compiler() to return early is to avoid a call to M::B->current(), which needs a 'build_params' file remaining from its own build. Notes: Forwarded: not-needed Patch-Name: 0001-Allow-loading-from-system-path-when-running-under-au.patch --- t/lib/MBTest.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/lib/MBTest.pm b/t/lib/MBTest.pm index fda7f69..86c6d1f 100644 --- a/t/lib/MBTest.pm +++ b/t/lib/MBTest.pm @@ -220,7 +220,7 @@ sub find_in_path { } sub check_compiler { - if ($ENV{PERL_CORE}) { + if ($ENV{PERL_CORE} || $ENV{ADTTMP}) { require IPC::Cmd; if ( $Config{usecrosscompile} && !IPC::Cmd::can_run($Config{cc}) ) { return; @@ -271,7 +271,7 @@ sub blib_load { (my $path = $mod) =~ s{::}{/}g; $path .= ".pm"; my ($pkg, $file, $line) = caller; - unless($ENV{PERL_CORE}) { + unless($ENV{PERL_CORE} || $ENV{ADTTMP}) { unless($INC{$path} =~ m/\bblib\b/) { (my $load_from = $INC{$path}) =~ s{$path$}{}; die "$mod loaded from '$load_from'\nIt should have been loaded from blib. \@INC contains:\n ", -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmodule-build-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits