In perl.git, the branch blead has been updated <https://perl5.git.perl.org/perl.git/commitdiff/2aac7c0f5aadfdcbc35fd5bdb7e2a4346759c8bd?hp=4f4c2c242927ac05bf7ded20acfc757c13fb39c0>
- Log ----------------------------------------------------------------- commit 2aac7c0f5aadfdcbc35fd5bdb7e2a4346759c8bd Author: Niko Tyni <nt...@debian.org> Date: Sun Dec 2 11:57:01 2018 +0200 Fix t/porting/manifest.t failures when run in a foreign git checkout The change at ba6733216202523a95b0b7ee2e534b8e30b6d7df didn't work correctly: find_git_or_skip() in t/test.pl looks at PERL_BUILD_PACKAGING too late, so it doesn't change the logic of skipping, only the explanation of why tests get skipped if they do. This was originally reported at <https://bugs.debian.org/914962>. Committer: update commit message for upstream context ----------------------------------------------------------------------- Summary of changes: t/test.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/t/test.pl b/t/test.pl index 406864d86d..25eae4009d 100644 --- a/t/test.pl +++ b/t/test.pl @@ -200,7 +200,9 @@ sub find_git_or_skip { $source_dir = '.' } } - if ($source_dir) { + if ($ENV{'PERL_BUILD_PACKAGING'}) { + $reason = 'PERL_BUILD_PACKAGING is set'; + } elsif ($source_dir) { my $version_string = `git --version`; if (defined $version_string && $version_string =~ /\Agit version (\d+\.\d+\.\d+)(.*)/) { @@ -213,9 +215,6 @@ sub find_git_or_skip { } else { $reason = 'not being run from a git checkout'; } - if ($ENV{'PERL_BUILD_PACKAGING'}) { - $reason = 'PERL_BUILD_PACKAGING is set'; - } skip_all($reason) if $_[0] && $_[0] eq 'all'; skip($reason, @_); } -- Perl5 Master Repository