X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fpod%2Ftestpchk.pl;h=8aa10b94f87c03a2a1583b9db3c039ac5e39541c;hb=9811a09ccbe459f08959a12230024bdfb9a9977f;hp=94c0c10fe5f3a07b123f6ee9b7e953749824d6e0;hpb=828c4421567f1da54062ec5edfcc3250be409b16;p=p5sagit%2Fp5-mst-13.2.git diff --git a/t/pod/testpchk.pl b/t/pod/testpchk.pl index 94c0c10..8aa10b9 100644 --- a/t/pod/testpchk.pl +++ b/t/pod/testpchk.pl @@ -34,18 +34,12 @@ sub msgcmp( $ $ ) { ## filter out platform-dependent aspects of error messages my ($line1, $line2) = @_; for ($line1, $line2) { - if ( /^#*\s*(\S.*?)\s+(?:has \d+\s*)?pod syntax (?:error|OK)/ ) { - my $fname = $1; - s/^#*\s*// if ($^O eq 'MacOS'); - s/^\s*\Q$fname\E/stripname($fname)/e; - } - elsif ( /^#*\s*\*+\s*(?:ERROR|Unterminated)/ ) { - s/^#*\s*// if ($^O eq 'MacOS'); - s/of file\s+(\S.*?)\s*$/"of file ".stripname($1)/e; - s/at\s+(\S.*?)\s+line/"at ".stripname($1)." line"/e; - } + ## remove filenames from error messages to avoid any + ## filepath naming differences between OS platforms + s/(at line \S+ in file) .*\W(\w+\.[tT])\s*$/$1 \L$2\E/; + s/.*\W(\w+\.[tT]) (has \d+ pod syntax error)/\L$1\E $2/; } - return $line1 ne $line2; + return ($line1 ne $line2); } sub testpodcheck( @ ) {