Skip to content

Commit 3e58007

Browse files
committed
Reset Perl testsuite to v5.30.0
Update TestInit, lib, regen and t Bump version to v5.30.0 MANIFEST not bump at this stage
1 parent 68f0b1f commit 3e58007

File tree

237 files changed

+100132
-84028
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+100132
-84028
lines changed

t/testsuite/TestInit.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# modules from an installed Perl.
1111
#
1212
# t/TEST and t/harness will invoke each test script with
13-
# perl -MTestInit[=arg,arg,..] some/test.t
13+
# perl -I. -MTestInit[=arg,arg,..] some/test.t
1414
# You may "use TestInit" in the test # programs but it is not required.
1515
#
1616
# TestInit will completely empty the current @INC and replace it with

t/testsuite/lib/AnyDBM_File.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ if ($AnyDBM_File::ISA[0] eq 'DB_File' && ($DB_File::db_ver >= 2.004010 && $DB_Fi
135135
$compact = "$major.$minor.$patch" ;
136136
#
137137
# anydbm.t test 12 will fail when AnyDBM_File uses the combination of
138-
# DB_File and Berkeley DB 2.4.10 (or greater).
138+
# DB_File and Berkeley DB 2.4.10 (or greater).
139139
# You are using DB_File $DB_File::VERSION and Berkeley DB $compact
140140
#
141141
# Berkeley DB 2 from version 2.4.10 onwards does not allow null keys.

t/testsuite/lib/Benchmark.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ is ($auto, $default, 'timestr ($diff, "auto") matches timestr ($diff)');
138138
is ($auto, $all, '"auto" isn\'t "noc", so should be eq to "all"');
139139
}
140140

141-
like (timestr ($diff, 'all', 'E'),
141+
like (timestr ($diff, 'all', 'E'),
142142
qr/(\d+) +wallclock secs? +\( *\d\.\d+E[-+]?\d\d\d? +usr +\d\.\d+E[-+]?\d\d\d? +sys +\+ +\d\.\d+E[-+]?\d\d\d? +cusr +\d\.\d+E[-+]?\d\d\d? +csys += +\d\.\d+E[-+]?\d\d\d? +CPU\)/, 'timestr ($diff, "all", "E") [sprintf format of "E"]');
143143
}
144144

@@ -243,7 +243,7 @@ like ($got, $Default_Pattern, 'should find default format somewhere');
243243
select OUT;
244244

245245
eval {
246-
timethese( 1,
246+
timethese( 1,
247247
{ undeclared_var => q{ $i++; $i-- },
248248
symbolic_ref => q{ $bar = 42;
249249
$foo = 'bar';

t/testsuite/lib/Config.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Config::config_vars(':PERL_API_.*'); # regex, non-tagged multi-line answer
111111
my $out6 = $$out;
112112
$out->clear;
113113

114-
Config::config_vars('PERL_API_REVISION.*:'); # regex, tagged
114+
Config::config_vars('PERL_API_REVISION.*:'); # regex, tagged
115115
my $out7 = $$out;
116116
$out->clear;
117117

t/testsuite/lib/DB.t

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ BEGIN {
4747
}
4848

4949
# test DB::DB()
50-
{
51-
ok( ! defined DB::DB(),
50+
{
51+
ok( ! defined DB::DB(),
5252
'DB::DB() should return undef if $DB::ready is false');
5353
is( DB::catch(), 1, 'DB::catch() should work' );
5454
is( DB->skippkg('foo'), 1, 'DB->skippkg() should push args' );
@@ -133,9 +133,9 @@ is( DB::_clientname('bar'), undef,
133133
like( $ret[0], qr/\@ = &eval \'one.+?2\)\'/, #'
134134
'... should find eval STRING construct');
135135
$ret[0] = check_context(1);
136-
like( $ret[0], qr/\$ = &main::check_context/,
136+
like( $ret[0], qr/\$ = &main::check_context/,
137137
'... should respect context of calling construct');
138-
138+
139139
$DB::signal = 1;
140140
@DB::args = (1, 7);
141141
@ret = three(1);
@@ -181,11 +181,11 @@ sub three { two(@_) }
181181
%DB::sub = map { $_ => $_ } qw( bazbar bazboo boobar booboo boobaz );
182182
my @ret = DB->filesubs();
183183
is( scalar @ret, 2, 'DB::filesubs() should use $DB::filename with no args');
184-
@ret = grep { /^baz/ } @ret;
184+
@ret = grep { /^baz/ } @ret;
185185
is( scalar @ret, 2, '... should pick up subs in proper file' );
186186
@ret = DB->filesubs('boo');
187187
is( scalar @ret, 3, '... should use argument to find subs' );
188-
@ret = grep { /^boo/ } @ret;
188+
@ret = grep { /^boo/ } @ret;
189189
is( scalar @ret, 3, '... should pick up subs in proper file with argument');
190190
}
191191

@@ -214,7 +214,7 @@ SKIP: {
214214
my $db = DB->loadfile($file);
215215
like( $db, qr!$file\z!, '... should find loaded file from partial name');
216216

217-
is( *DB::dbline, *{ "_<$db" } ,
217+
is( *DB::dbline, *{ "_<$db" } ,
218218
'... should set *DB::dbline to associated glob');
219219
is( $DB::filename, $db, '... should set $DB::filename to file name' );
220220

@@ -227,7 +227,7 @@ SKIP: {
227227

228228
local $DB::filename = 'baz';
229229
local *baz = *{ "main::_<baz" };
230-
230+
231231
@baz = map { dualvar(1, $_) } qw( one two three four five );
232232
%baz = (
233233
1 => "foo\0bar",
@@ -257,13 +257,13 @@ SKIP: {
257257
local %DB::sub = (
258258
'main::foo' => 'foo:1-4',
259259
);
260-
260+
261261
DB->set_break(1, 'foo');
262262
is( $DB::dbline{1}, "foo\0", 'DB::set_break() should set break condition' );
263263

264264
$DB::lineno = 1;
265265
DB->set_break(undef, 'bar');
266-
is( $DB::dbline{1}, "bar\0",
266+
is( $DB::dbline{1}, "bar\0",
267267
'... should use $DB::lineno without specified line' );
268268

269269
DB->set_break(4);
@@ -273,7 +273,7 @@ SKIP: {
273273
'main::foo' => 'foo:1-4',
274274
);
275275
DB->set_break('foo', 'baz');
276-
is( $DB::dbline{4}, "baz\0abc",
276+
is( $DB::dbline{4}, "baz\0abc",
277277
'... should use _find_subline() to resolve subname' );
278278

279279
my $db = FakeDB->new();
@@ -296,7 +296,7 @@ SKIP: {
296296
'main::foo' => 'foo:1-4',
297297
);
298298
DB->set_tbreak('foo', 'baz');
299-
is( $DB::dbline{4}, ';9',
299+
is( $DB::dbline{4}, ';9',
300300
'... should use _find_subline() to resolve subname' );
301301

302302
my $db = FakeDB->new();
@@ -321,21 +321,21 @@ SKIP: {
321321

322322
$foo[11] = $dualtrue;
323323

324-
is( DB::_find_subline('TEST::foo'), 11,
324+
is( DB::_find_subline('TEST::foo'), 11,
325325
'DB::_find_subline() should find fully qualified sub' );
326326
is( DB::_find_subline("TEST'foo"), 11, '... should handle old package sep');
327-
is( DB::_find_subline('foo'), 11,
327+
is( DB::_find_subline('foo'), 11,
328328
'... should resolve unqualified package name to main::' );
329329

330330
$DB::package = 'bar';
331-
is( DB::_find_subline('bar'), 11,
331+
is( DB::_find_subline('bar'), 11,
332332
'... should resolve unqualified name with $DB::package, if defined' );
333-
333+
334334
$foo[11] = $dualfalse;
335335

336-
is( DB::_find_subline('TEST::foo'), 15,
336+
is( DB::_find_subline('TEST::foo'), 15,
337337
'... should increment past lines with no events' );
338-
338+
339339
ok( ! defined DB::_find_subline('sirnotappearinginthisfilm'),
340340
'... should not find nonexistent sub' );
341341
}
@@ -367,25 +367,25 @@ SKIP: {
367367
%DB::dbline = %lines;
368368
DB->clr_breaks('foo');
369369

370-
is( $DB::dbline{3}, "\0\0\0abc",
370+
is( $DB::dbline{3}, "\0\0\0abc",
371371
'... should find lines via _find_subline()' );
372-
372+
373373
my $db = FakeDB->new();
374374
DB::clr_breaks($db, 'abadsubname');
375-
is( $db->{output}, "Subroutine not found.\n",
375+
is( $db->{output}, "Subroutine not found.\n",
376376
'... should output warning if sub cannot be found');
377377

378378
@DB::dbline = (1 .. 4);
379379
%DB::dbline = (%lines, 5 => "\0" );
380380

381381
DB::clr_breaks();
382382

383-
is( scalar keys %DB::dbline, 4,
383+
is( scalar keys %DB::dbline, 4,
384384
'Relying on @DB::dbline in DB::clr_breaks() should clear breaks' );
385385
ok( ! exists($DB::dbline{1}), '... should delete empty actions' );
386386
is( $DB::dbline{3}, "\0\0\0abc", '... should remove break, leaving action');
387387
is( $DB::dbline{4}, "\0\0\0abc", '... should not remove set actions' );
388-
ok( exists($DB::dbline{5}),
388+
ok( exists($DB::dbline{5}),
389389
'... should only go to last index of @DB::dbline' );
390390
}
391391

@@ -400,18 +400,18 @@ SKIP: {
400400
*DB::dbline = [ $dualfalse, $dualfalse, $dualtrue, $dualtrue ];
401401

402402
DB->set_action(2, 'def');
403-
is( $DB::dbline{2}, "\0def",
403+
is( $DB::dbline{2}, "\0def",
404404
'DB::set_action() should replace existing action' );
405405
DB->set_action(3, '');
406406
is( $DB::dbline{3}, "\0", '... should set new action' );
407407

408408
my $db = FakeDB->new();
409409
DB::set_action($db, 'abadsubname');
410-
is( $db->{output}, "Subroutine not found.\n",
410+
is( $db->{output}, "Subroutine not found.\n",
411411
'... should output warning if sub cannot be found');
412412

413413
DB::set_action($db, 1);
414-
like( $db->{output}, qr/1 not action/,
414+
like( $db->{output}, qr/1 not action/,
415415
'... should warn if line cannot be actionivated' );
416416
}
417417

@@ -446,23 +446,23 @@ SKIP: {
446446
DB->clr_actions('foo');
447447

448448
is( $DB::dbline{3}, "123", '... should find lines via _find_subline()' );
449-
449+
450450
my $db = FakeDB->new();
451451
DB::clr_actions($db, 'abadsubname');
452-
is( $db->{output}, "Subroutine not found.\n",
452+
is( $db->{output}, "Subroutine not found.\n",
453453
'... should output warning if sub cannot be found');
454454

455455
@DB::dbline = (1 .. 4);
456456
%DB::dbline = (%lines, 5 => "\0" );
457457

458458
DB::clr_actions();
459459

460-
is( scalar keys %DB::dbline, 4,
460+
is( scalar keys %DB::dbline, 4,
461461
'Relying on @DB::dbline in DB::clr_actions() should clear actions' );
462462
ok( ! exists($DB::dbline{1}), '... should delete empty actions' );
463463
is( $DB::dbline{3}, "123", '... should remove action, leaving break');
464464
is( $DB::dbline{4}, "abc\0", '... should not remove set breaks' );
465-
ok( exists($DB::dbline{5}),
465+
ok( exists($DB::dbline{5}),
466466
'... should only go to last index of @DB::dbline' );
467467
}
468468

@@ -473,7 +473,7 @@ DB::prestop('test', 897);
473473
is( DB::prestop('test'), 897, '... should return value when set' );
474474

475475
# test DB::poststop(), not exactly parallel
476-
ok( ! defined DB::poststop('tset'),
476+
ok( ! defined DB::poststop('tset'),
477477
'DB::prestop() should return undef for undef value' );
478478
DB::poststop('tset', 987);
479479
is( DB::poststop('tset'), 987, '... should return value when set' );
@@ -490,7 +490,7 @@ ok( DB::register( FakeDB->new() ), 'DB::register() should work' );
490490
DB::register( FakeDB->new() ) for ( 1 .. 2);
491491

492492
DB::_outputall(1, 2, 3);
493-
is( $FakeDB::output, '123123123',
493+
is( $FakeDB::output, '123123123',
494494
'DB::_outputall() should call output(@_) on all clients' );
495495

496496
# test virtual methods

t/testsuite/lib/DirHandle.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ BEGIN {
1313
use DirHandle;
1414
use Test::More tests => 31;
1515

16-
# Fetching the list of files in two different ways and expecting them
16+
# Fetching the list of files in two different ways and expecting them
1717
# to be the same is a race condition when tests are running in parallel.
1818
# So go somewhere quieter.
1919
my $chdir;

t/testsuite/lib/blib.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if ($Is_VMS) {
2121
$vms_unix_rpt = VMS::Feature::current("filename_unix_report");
2222
} else {
2323
my $unix_rpt = $ENV{'DECC$FILENAME_UNIX_REPORT'} || '';
24-
$vms_unix_rpt = $unix_rpt =~ /^[ET1]/i;
24+
$vms_unix_rpt = $unix_rpt =~ /^[ET1]/i;
2525
}
2626
$Is_VMS_mode = 0 if ($vms_unix_rpt);
2727
}
@@ -38,7 +38,7 @@ sub _mkdirs {
3838
mkdir $dir or die "Can't mkdir $dir: $!" if ! -d $dir;
3939
}
4040
}
41-
41+
4242

4343
BEGIN {
4444
$blib = "blib";

t/testsuite/lib/bytes.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ utf8::encode(my $c2_utf8 = $c2);
5757
is(bytes::index($c, "\x80"), 1, "bytes::index under use bytes looks at bytes");
5858
is(bytes::rindex($c, "\xc4"), 0, "bytes::rindex under use bytes looks at bytes");
5959
}
60-
60+
6161
# [perl #117355] [lu]cfirst don't respect 'use bytes'
6262
# and if there's other tests for lc/uc under bytes I didn't find them
6363
is(lc($c2), $c2_utf8, "lc under use bytes returns bytes");

t/testsuite/lib/diagnostics.t

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ is runperl(@runperl_args, prog => $subs),
214214
<< 'EOT', 'internal error with backtrace';
215215
panic: gremlins at -e line 1 (#1)
216216
(P) An internal error.
217-
217+
218218
Uncaught exception from user code:
219219
panic: gremlins at -e line 1.
220220
main::baz() called at -e line 1
@@ -233,7 +233,7 @@ is runperl(@runperl_args, prog => 'die q _panic: gremlins_'),
233233
<< 'EOV', 'no backtrace from top-level internal error';
234234
panic: gremlins at -e line 1 (#1)
235235
(P) An internal error.
236-
236+
237237
Uncaught exception from user code:
238238
panic: gremlins at -e line 1.
239239
EOV
@@ -260,7 +260,7 @@ is runperl(@runperl_args, prog => 'BEGIN { die q _panic: gremlins_ }'),
260260
panic: gremlins at -e line 1.
261261
BEGIN failed--compilation aborted at -e line 1 (#1)
262262
(P) An internal error.
263-
263+
264264
Uncaught exception from user code:
265265
panic: gremlins at -e line 1.
266266
BEGIN failed--compilation aborted at -e line 1.

t/testsuite/lib/dumpvar.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require "dumpvar.pl";
3030
sub unctrl { print dumpvar::unctrl($_[0]), "\n" }
3131
sub uniescape { print dumpvar::uniescape($_[0]), "\n" }
3232
sub stringify { print dumpvar::stringify($_[0]), "\n" }
33-
sub dumpvalue {
33+
sub dumpvalue {
3434
# Call main::dumpValue exactly as the perl5db.pl calls it.
3535
local $\ = '';
3636
local $, = '';

0 commit comments

Comments
 (0)