In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/07a63b998433c2d05ac3376f7c11dc1bd3e3f49c?hp=fbe521465f3f73ca77e746257b5cd6411086e960>
- Log -----------------------------------------------------------------
commit 07a63b998433c2d05ac3376f7c11dc1bd3e3f49c
Author: Nicholas Clark <n...@ccl4.org>
Date: Fri Feb 4 22:14:29 2011 +0100
Remove MacOS Classic references from B's tests.
-----------------------------------------------------------------------
Summary of changes:
ext/B/t/showlex.t | 4 +---
ext/B/t/terse.t | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/ext/B/t/showlex.t b/ext/B/t/showlex.t
index 257b9c9..6a53182 100644
--- a/ext/B/t/showlex.t
+++ b/ext/B/t/showlex.t
@@ -22,17 +22,15 @@ my $verbose = @ARGV; # set if ANY ARGS
my $a;
my $Is_VMS = $^O eq 'VMS';
-my $Is_MacOS = $^O eq 'MacOS';
my $path = join " ", map { qq["-I$_"] } @INC;
$path = '"-I../lib" "-Iperl_root:[lib]"' if $Is_VMS; # gets too long
otherwise
-my $redir = $Is_MacOS ? "" : "2>&1";
my $is_thread = $Config{use5005threads} && $Config{use5005threads} eq 'define';
if ($is_thread) {
ok "# use5005threads: test skipped\n";
} else {
- $a = `$^X $path "-MO=Showlex" -e "my \@one" $redir`;
+ $a = `$^X $path "-MO=Showlex" -e "my \@one" 2>&1`;
like ($a, qr/sv_undef.*PVNV.*\@one.*sv_undef.*AV/s,
"canonical usage works");
}
diff --git a/ext/B/t/terse.t b/ext/B/t/terse.t
index 7c1d396..26e2e76 100644
--- a/ext/B/t/terse.t
+++ b/ext/B/t/terse.t
@@ -91,9 +91,7 @@ sub bar {
# Schwern's example of finding an RV
my $path = join " ", map { qq["-I$_"] } @INC;
-$path = '-I::lib -MMac::err=unix' if $^O eq 'MacOS';
-my $redir = $^O eq 'MacOS' ? '' : "2>&1";
-my $items = qx{$^X $path "-MO=Terse" -le "print \\42" $redir};
+my $items = qx{$^X $path "-MO=Terse" -le "print \\42" 2>&1};
if( $] >= 5.011 ) {
like( $items, qr/IV $hex \\42/, 'RV (but now stored in an IV)' );
} else {
--
Perl5 Master Repository
