Skip to content

Commit cda0edd

Browse files
committed
Make t/prereq_print.t and t/min_perl_version.t withstand chcp errors
1 parent e09f952 commit cda0edd

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

t/min_perl_version.t

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ END
139139
note "PREREQ_PRINT output"; {
140140
my $prereq_out = run(qq{$perl Makefile.PL "PREREQ_PRINT=1"});
141141
is( $?, 0, 'PREREQ_PRINT exiting normally' );
142+
$prereq_out =~ s/.*(\$PREREQ_PM\s*=)/$1/s; # strip off errors eg from chcp
142143
my $prereq_out_sane = $prereq_out =~ /^\s*\$PREREQ_PM\s*=/;
143144
ok( $prereq_out_sane, ' and talking like we expect' ) ||
144145
diag($prereq_out);
@@ -166,7 +167,7 @@ note "PRINT_PREREQ output"; {
166167
is( $?, 0, 'PRINT_PREREQ exiting normally' );
167168
ok( $prereq_out !~ /^warning/i, ' and not complaining loudly' );
168169
like( $prereq_out,
169-
qr/^perl\(perl\) \s* >= 5\.005 \s+ perl\(strict\) \s* >= \s* 0 \s*$/x,
170+
qr/^perl\(perl\) \s* >= 5\.005 \s+ perl\(strict\) \s* >= \s* 0 \s*$/mx,
170171
'dump has prereqs and perl version' );
171172
}
172173

t/prereq_print.t

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ unlink $Makefile;
5050
my $prereq_out = run(qq{$Perl Makefile.PL "PREREQ_PRINT=1"});
5151
ok( !-r $Makefile, "PREREQ_PRINT produces no $Makefile" );
5252
is( $?, 0, ' exited normally' );
53+
$prereq_out =~ s/^'chcp' is not recognized.*batch file\.//s; # remove errors
5354
{
5455
package _Prereq::Print;
5556
no strict;
@@ -63,7 +64,7 @@ is( $?, 0, ' exited normally' );
6364
$prereq_out = run(qq{$Perl Makefile.PL "PRINT_PREREQ=1"});
6465
ok( !-r $Makefile, "PRINT_PREREQ produces no $Makefile" );
6566
is( $?, 0, ' exited normally' );
66-
::like( $prereq_out, qr/^perl\(strict\) \s* >= \s* 0 \s*$/x,
67+
::like( $prereq_out, qr/^perl\(strict\) \s* >= \s* 0 \s*$/mx,
6768
'prereqs dumped' );
6869

6970

0 commit comments

Comments
 (0)