Skip to content

Commit 0b7fa63

Browse files
toddrtoddr
committed
Update Filter-Util-Call to CPAN version 1.60
[DELTA] 1.60 2020-08-05 rurban - Increase t/call.t verbosity on failures (PR #12 aatomic) - Push cwd to @inc for PERL_CORE (PR #11 jkeenan) - Update search.cpan.org link to metacpan (PR #10 Grinnz)
1 parent 401624c commit 0b7fa63

File tree

7 files changed

+40
-30
lines changed

7 files changed

+40
-30
lines changed

‎Porting/Maintainers.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ package Maintainers;
548548
},
549549

550550
'Filter::Util::Call' => {
551-
'DISTRIBUTION' => 'RURBAN/Filter-1.59.tar.gz',
551+
'DISTRIBUTION' => 'RURBAN/Filter-1.60.tar.gz',
552552
'FILES' => q[cpan/Filter-Util-Call
553553
pod/perlfilter.pod
554554
],
@@ -559,6 +559,7 @@ package Maintainers;
559559
qr{^lib/Filter/},
560560
qr{^tee/},
561561
qw( .appveyor.yml
562+
.whitesource
562563
Call/Makefile.PL
563564
Call/ppport.h
564565
Call/typemap

‎cpan/Filter-Util-Call/Call.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use warnings;
1818

1919
our @ISA = qw(Exporter);
2020
our @EXPORT = qw( filter_add filter_del filter_read filter_read_exact) ;
21-
our $VERSION = "1.59" ;
21+
our $VERSION = "1.60" ;
2222
our $XS_VERSION = $VERSION;
2323
$VERSION = eval $VERSION;
2424

‎cpan/Filter-Util-Call/Call.xs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Author : Paul Marquess
55
* Date : 2014-12-09 02:48:44 rurban
6-
* Version : 1.59
6+
* Version : 1.60
77
*
88
* Copyright (c) 1995-2011 Paul Marquess. All rights reserved.
99
* Copyright (c) 2011-2014 Reini Urban. All rights reserved.

‎cpan/Filter-Util-Call/t/call.t

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ BEGIN {
66
print "1..0 # Skip: Filter::Util::Call was not built\n";
77
exit 0;
88
}
9+
require Cwd;
10+
unshift @INC, Cwd::cwd();
911
}
1012
}
1113

@@ -128,18 +130,18 @@ use $module ;
128130
EOM
129131

130132
use Cwd ;
131-
$here = getcwd ;
133+
my $here = getcwd ;
132134
print "I am $here\n" ;
133135
print "some letters ABC\n" ;
134-
$y = "ABCDEF" ;
136+
my $y = "ABCDEF" ;
135137
print <<EOF ;
136138
Alphabetti Spagetti ($y)
137139
EOF
138140

139141
EOM
140142

141143
$a = `$Perl "-I." $Inc $filename $redir` ;
142-
ok(5, ($? >>8) == 0) ;
144+
ok(5, ($? >>8) == 0) or warn $a;
143145
ok(6, $a eq <<EOM) ;
144146
I am $here
145147
some letters DEF
@@ -177,18 +179,18 @@ use $module ;
177179
EOM
178180

179181
use Cwd ;
180-
$here = getcwd ;
182+
my $here = getcwd ;
181183
print "I am $here\n" ;
182184
print "some letters ABC\n" ;
183-
$y = "ABCDEF" ;
185+
my $y = "ABCDEF" ;
184186
print <<EOF ;
185187
Alphabetti Spagetti ($y)
186188
EOF
187189

188190
EOM
189191

190192
$a = `$Perl "-I." $Inc $filename $redir` ;
191-
ok(7, ($? >>8) == 0) ;
193+
ok(7, ($? >>8) == 0) or warn $a;
192194
ok(8, $a eq <<EOM) ;
193195
I am $here
194196
some letters DEF
@@ -284,7 +286,7 @@ use $module4 ;
284286
EOM
285287

286288
print "some letters ABCXYZ\n" ;
287-
$y = "ABCDEFXYZ" ;
289+
my $y = "ABCDEFXYZ" ;
288290
print <<EOF ;
289291
Fred likes Alphabetti Spagetti ($y)
290292
EOF
@@ -303,7 +305,7 @@ EOF
303305
EOM
304306

305307
$a = `$Perl "-I." $Inc $filename $redir` ;
306-
ok(9, ($? >>8) == 0) ;
308+
ok(9, ($? >>8) == 0) or warn $a;
307309
ok(10, $a eq <<EOM) ;
308310
I'm feeling used!
309311
Fred Joe ABC DEF PQR XYZ
@@ -357,15 +359,15 @@ use $module2 qw( ABC NMO) ;
357359
EOM
358360

359361
print "some letters ABCXYZ KLM NMO\n" ;
360-
$y = "ABCDEFXYZKLMNMO" ;
362+
my $y = "ABCDEFXYZKLMNMO" ;
361363
print <<EOF ;
362364
Alphabetti Spagetti ($y)
363365
EOF
364366

365367
EOM
366368

367369
$a = `$Perl "-I." $Inc $filename $redir` ;
368-
ok(11, ($? >>8) == 0) ;
370+
ok(11, ($? >>8) == 0) or warn $a;
369371
ok(12, $a eq <<EOM) ;
370372
some letters PQRPQR PQR PQR
371373
Alphabetti Spagetti (PQRDEFPQRPQRPQR)
@@ -416,15 +418,15 @@ use $module2 qw( ABC NMO) ;
416418
EOM
417419

418420
print "some letters ABCXYZ KLM NMO\n" ;
419-
$y = "ABCDEFXYZKLMNMO" ;
421+
my $y = "ABCDEFXYZKLMNMO" ;
420422
print <<EOF ;
421423
Alphabetti Spagetti ($y)
422424
EOF
423425

424426
EOM
425427

426428
$a = `$Perl "-I." $Inc $filename $redir` ;
427-
ok(13, ($? >>8) == 0) ;
429+
ok(13, ($? >>8) == 0) or warn $a;
428430
ok(14, $a eq <<EOM) ;
429431
some letters PQRPQR PQR PQR
430432
Alphabetti Spagetti (PQRDEFPQRPQRPQR)
@@ -484,7 +486,7 @@ F
484486
EOM
485487
486488
$a = `$Perl "-I." $Inc $filename $redir` ;
487-
ok(15, ($? >>8) == 0) ;
489+
ok(15, ($? >>8) == 0) or warn $a;
488490
ok(16, $a eq <<EOM) ;
489491
don't cut me in half
490492
appended
@@ -522,7 +524,7 @@ EOM
522524
523525
my $string = <<'EOM' ;
524526
print "hello mum\n" ;
525-
$x = 'me ' x 3 ;
527+
my $x = 'me ' x 3 ;
526528
print "Who wants it?\n$x\n" ;
527529
EOM
528530
@@ -532,7 +534,7 @@ use $block ;
532534
EOM
533535
534536
$a = `$Perl "-I." $Inc $filename $redir` ;
535-
ok(17, ($? >>8) == 0) ;
537+
ok(17, ($? >>8) == 0) or warn $a;
536538
ok(18, $a eq <<EOM) ;
537539
hello mum
538540
Who wants it?
@@ -580,7 +582,7 @@ print "We are in DIR\n" ;
580582
EOM
581583
582584
$a = `$Perl "-I." $Inc $filename $redir` ;
583-
ok(19, ($? >>8) == 0) ;
585+
ok(19, ($? >>8) == 0) or warn $a;
584586
ok(20, $a eq <<EOM) ;
585587
We are in $here
586588
EOM
@@ -631,7 +633,7 @@ HERE today gone tomorrow\n" ;
631633
EOM
632634
633635
$a = `$Perl "-I." $Inc $filename $redir` ;
634-
ok(21, ($? >>8) == 0) ;
636+
ok(21, ($? >>8) == 0) or warn $a;
635637
ok(22, $a eq <<EOM) ;
636638
637639
THERE I am
@@ -681,7 +683,7 @@ HERE today gone tomorrow\n" ;
681683
EOM
682684
683685
$a = `$Perl "-I." $Inc $filenamebin $redir` ;
684-
ok(23, ($? >>8) == 0) ;
686+
ok(23, ($? >>8) == 0) or warn $a;
685687
ok(24, $a eq <<EOM) ;
686688
687689
HERE I am
@@ -726,7 +728,7 @@ writeFile($filename, <<EOM, <<'EOM') ;
726728
use $block ;
727729
EOM
728730
print "HERE HERE\n";
729-
@a = <DATA>;
731+
my @a = <DATA>;
730732
print @a;
731733
__DATA__
732734
HERE I am
@@ -735,7 +737,7 @@ HERE today gone tomorrow
735737
EOM
736738
737739
$a = `$Perl "-I." $Inc $filename $redir` ;
738-
ok(25, ($? >>8) == 0) ;
740+
ok(25, ($? >>8) == 0) or warn $a;
739741
ok(26, $a eq <<EOM) ;
740742
THERE THERE
741743
HERE I am
@@ -782,7 +784,7 @@ writeFile($filename, <<EOM, <<'EOM') ;
782784
use $block ;
783785
EOM
784786
print "HERE HERE\n";
785-
@a = <DATA>;
787+
my @a = <DATA>;
786788
print @a;
787789
__END__
788790
HERE I am
@@ -791,7 +793,7 @@ HERE today gone tomorrow
791793
EOM
792794
793795
$a = `$Perl "-I." $Inc $filename $redir` ;
794-
ok(27, ($? >>8) == 0) ;
796+
ok(27, ($? >>8) == 0) or warn $a;
795797
ok(28, $a eq <<EOM) ;
796798
THERE THERE
797799
HERE I am
@@ -824,12 +826,12 @@ EOM
824826
825827
my $str = $^O eq 'MacOS' ? "'ok'" : "q{ok}";
826828
my $a = `$Perl "-I." $Inc -e "no ${module6}; print $str"`;
827-
ok(29, ($? >>8) == 0);
829+
ok(29, ($? >>8) == 0) or warn $a;
828830
chomp( $a ) if $^O eq 'VMS';
829831
ok(30, $a eq 'ok');
830832
831833
$a = `$Perl "-I." $Inc $filename2`;
832-
ok(31, ($? >>8) == 0);
834+
ok(31, ($? >>8) == 0) or warn $a;
833835
chomp( $a ) if $^O eq 'VMS';
834836
ok(32, $a eq 'ok');
835837
@@ -873,7 +875,7 @@ HERE today gone tomorrow\n" ;
873875
EOM
874876
875877
$a = `$Perl "-I." $Inc $filenamebin $redir` ;
876-
ok(33, ($? >>8) != 0) ;
878+
ok(33, ($? >>8) != 0) or warn $a;
877879
ok(34, $a =~ /^filter_read_exact: size parameter must be > 0 at block.pm/) ;
878880
879881

‎cpan/Filter-Util-Call/t/rt_54452-rebless.t

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ if ($] < 5.004_55) {
66
exit 0;
77
}
88

9+
BEGIN {
10+
if ($ENV{PERL_CORE}) {
11+
require Cwd;
12+
unshift @INC, Cwd::cwd();
13+
}
14+
}
15+
916
use strict;
1017
use warnings;
1118

‎pod/perlfilter.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ code chunks beginning with the division operator C</>. As a workaround
571571
you must use C<m/.../> or C<m?...?> for such patterns. Also, the presence of
572572
regexes specified with raw C<?...?> delimiters may cause mysterious
573573
errors. The workaround is to use C<m?...?> instead. See
574-
L<https://search.cpan.org/perldoc?Switch#LIMITATIONS>
574+
L<https://metacpan.org/pod/Switch#LIMITATIONS>.
575575

576576
Currently the content of the C<__DATA__> block is not filtered.
577577

‎t/porting/customized.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Digest::MD5 cpan/Digest-MD5/MD5.pm df5f0663f0f755be7eda6e3d2f008f2629246b19
99
Digest::MD5 cpan/Digest-MD5/MD5.xs 249bed648232192ce018f7f894ad127c3a639831
1010
Digest::MD5 cpan/Digest-MD5/t/files.t e987329d2411ff60ad9a2bdf93fdf5f6943467e8
1111
ExtUtils::Constant cpan/ExtUtils-Constant/t/Constant.t d5c75c41d6736a0c5897130f534af0896a7d6f4d
12-
Filter::Util::Call pod/perlfilter.pod 67d1ea264f5fe88e9422976e2a903bf3d1671f6d
12+
Filter::Util::Call pod/perlfilter.pod 9b4aec0d8518274ddb0dd37e3b770fe13a44dd1f
1313
Locale::Maketext::Simple cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm 57ed38905791a17c150210cd6f42ead22a7707b6
1414
Math::Complex cpan/Math-Complex/lib/Math/Complex.pm 66f28a17647e2de166909ca66e4ced26f8a0a62e
1515
Math::Complex cpan/Math-Complex/t/Complex.t 17039e03ee798539e770ea9a0d19a99364278306

0 commit comments

Comments
 (0)