In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/47d3b731f074752fe0862ffdf333cfd3935f793a?hp=3a9cf8755d34984fcf296e1f3ea4d096ff05527d>
- Log ----------------------------------------------------------------- commit 47d3b731f074752fe0862ffdf333cfd3935f793a Author: Father Chrysostomos <[email protected]> Date: Thu Oct 16 08:28:29 2014 -0700 sv.c:sv_catsv: Remove null check SvPV always returns something. If it didnât, weâd be crashing all over the place, since most other code assumes it does. M sv.c commit 1310f67f4ef0cc3c6f42d26ff702a34799d6ac0d Author: Father Chrysostomos <[email protected]> Date: Thu Oct 16 08:25:20 2014 -0700 podcheck.t: Make pod name check less sensitive I regularly find myself ignoring the pod name failure after tweaking the pod or rebasing and not re-running make. âKnownâ test failures are not a good thing. M t/porting/podcheck.t ----------------------------------------------------------------------- Summary of changes: sv.c | 8 +++----- t/porting/podcheck.t | 6 ++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sv.c b/sv.c index 7383248..cd77099 100644 --- a/sv.c +++ b/sv.c @@ -5470,14 +5470,12 @@ Perl_sv_catsv_flags(pTHX_ SV *const dsv, SV *const ssv, const I32 flags) if (ssv) { STRLEN slen; const char *spv = SvPV_flags_const(ssv, slen, flags); - if (spv) { - if (flags & SV_GMAGIC) + if (flags & SV_GMAGIC) SvGETMAGIC(dsv); - sv_catpvn_flags(dsv, spv, slen, + sv_catpvn_flags(dsv, spv, slen, DO_UTF8(ssv) ? SV_CATUTF8 : SV_CATBYTES); - if (flags & SV_SMAGIC) + if (flags & SV_SMAGIC) SvSETMAGIC(dsv); - } } } diff --git a/t/porting/podcheck.t b/t/porting/podcheck.t index e3d9be9..9510bec 100644 --- a/t/porting/podcheck.t +++ b/t/porting/podcheck.t @@ -1619,6 +1619,7 @@ foreach my $filename (@files) { $same = $prior_contents eq $contents; } + use File::Basename 'basename'; if ($same) { $checker->set_skip("The pod of $filename is a duplicate of " . "the pod for $prior_filename"); @@ -1633,6 +1634,11 @@ foreach my $filename (@files) { $checker->set_skip("CPAN is upstream for $filename"); } elsif ( $filename =~ /^utils/ or $prior_filename =~ /^utils/ ) { $checker->set_skip("$filename copy is in utils/"); + } elsif ($prior_filename =~ /^(?:cpan|ext|dist)/ + && $filename !~ /^(?:cpan|ext|dist)/ + && basename($prior_filename) eq basename($filename)) + { + $checker->set_skip("$filename: Need to run make?"); } else { # Here have two pods with identical names that differ $prior_checker->poderror( { -msg => $duplicate_name, -- Perl5 Master Repository
