In perl.git, the branch maint-5.10 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/0bd1c8c5e0428f0a7e4ed1da202a144ce822b0c2?hp=0b43a56a15be6cf290817ada3eda7a28ea926266>
- Log ----------------------------------------------------------------- commit 0bd1c8c5e0428f0a7e4ed1da202a144ce822b0c2 Author: Craig A. Berry <[email protected]> Date: Sat Aug 15 14:27:09 2009 -0500 Suppress system messages when op/ref.t calls die on VMS. (cherry picked from commit 54c717c31383ee341b51465df1a84524ff7245b5) M t/op/ref.t commit ea6014d87850fa4eb32af55132e55b2ab7ee6008 Author: David Golden <[email protected]> Date: Sat Aug 15 14:39:39 2009 -0400 quick fix cpan -r (cherry picked from commit e13751452f8f5397a445636efcdb6e48c40a2ea9) M lib/CPAN/bin/cpan ----------------------------------------------------------------------- Summary of changes: lib/CPAN/bin/cpan | 2 +- t/op/ref.t | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/CPAN/bin/cpan b/lib/CPAN/bin/cpan index 52a1b20..d06666e 100644 --- a/lib/CPAN/bin/cpan +++ b/lib/CPAN/bin/cpan @@ -225,7 +225,7 @@ my %Method_table = ( O => [ \&_show_out_of_date, 0, 0, 'Showing Out of date' ], L => [ \&_show_author_mods, 1, 0, 'Showing author mods' ], a => [ \&_create_autobundle, 0, 0, 'Creating autobundle' ], - r => [ \&_recompile, 0, 0, 'Recompiling' ], + r => [ \&_recompiling, 0, 0, 'Recompiling' ], c => [ \&_default, 1, 0, 'Running `make clean`' ], f => [ \&_default, 1, 0, 'Installing with force' ], diff --git a/t/op/ref.t b/t/op/ref.t index 9ef7b7a..a98da6e 100644 --- a/t/op/ref.t +++ b/t/op/ref.t @@ -588,9 +588,10 @@ ok (!eval { $rpvbm->foo }, 'PVBM is not an object'); is( runperl(stderr => 1, prog => 'map eval qq(exit),1 for 1'), ""); is( runperl(stderr => 1, prog => 'eval { for (1) { map { die } 2 } };'), ""); is( runperl(stderr => 1, prog => 'for (125) { map { exit } (213)}'), ""); -is( runperl(stderr => 1, prog => 'map die,4 for 3'), "Died at -e line 1.\n"); -is( runperl(stderr => 1, prog => 'grep die,4 for 3'), "Died at -e line 1.\n"); -is( runperl(stderr => 1, prog => 'for $a (3) {...@b=sort {die} 4,5}'), "Died at -e line 1.\n"); +my $hushed = $^O eq 'VMS' ? 'use vmsish qw(hushed);' : ''; +is( runperl(stderr => 1, prog => $hushed . 'map die,4 for 3'), "Died at -e line 1.\n"); +is( runperl(stderr => 1, prog => $hushed . 'grep die,4 for 3'), "Died at -e line 1.\n"); +is( runperl(stderr => 1, prog => $hushed . 'for $a (3) {...@b=sort {die} 4,5}'), "Died at -e line 1.\n"); # bug 57564 is( runperl(stderr => 1, prog => 'my $i;for $i (1) { for $i (2) { } }'), ""); -- Perl5 Master Repository
