From: Nicholas Clark <nick@ccl4.org>
Date: Mon, 24 Aug 2009 12:37:23 +0000 (+0100)
Subject: Remove the MacOS Classic support from deparse.t (as it's getting in the way).
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7cde0a5fa931736ae578588f3b4f839dfb0d626d;p=p5sagit%2Fp5-mst-13.2.git

Remove the MacOS Classic support from deparse.t (as it's getting in the way).
---

diff --git a/ext/B/t/deparse.t b/ext/B/t/deparse.t
index 27e9f9e..eb5926f 100644
--- a/ext/B/t/deparse.t
+++ b/ext/B/t/deparse.t
@@ -3,12 +3,8 @@
 BEGIN {
     if ($ENV{PERL_CORE}){
 	chdir('t') if -d 't';
-	if ($^O eq 'MacOS') {
-	    @INC = qw(: ::lib ::macos:lib);
-	} else {
-	    @INC = '.';
-	    push @INC, '../lib';
-	}
+	@INC = '.';
+	push @INC, '../lib';
     } else {
 	unshift @INC, 't';
     }
@@ -112,14 +108,9 @@ my $val = (eval $string)->() or diag $string;
 is(ref($val), 'ARRAY');
 is($val->[0], 'hello');
 
-my $Is_VMS = $^O eq 'VMS';
-my $Is_MacOS = $^O eq 'MacOS';
-
 my $path = join " ", map { qq["-I$_"] } @INC;
-$path .= " -MMac::err=unix" if $Is_MacOS;
-my $redir = $Is_MacOS ? "" : "2>&1";
 
-$a = `$^X $path "-MO=Deparse" -anlwi.bak -e 1 $redir`;
+$a = `$^X $path "-MO=Deparse" -anlwi.bak -e 1 2>&1`;
 $a =~ s/-e syntax OK\n//g;
 $a =~ s/.*possible typo.*\n//;	   # Remove warning line
 $a =~ s{\\340\\242}{\\s} if (ord("\\") == 224); # EBCDIC, cp 1047 or 037
@@ -134,12 +125,6 @@ LINE: while (defined($_ = <ARGV>)) {
     '???';
 }
 EOF
-$b =~ s/(LINE:)/sub BEGIN {
-    'MacPerl'->bootstrap;
-    'OSA'->bootstrap;
-    'XL'->bootstrap;
-}
-$1/ if $Is_MacOS;
 is($a, $b);
 
 #Re: perlbug #35857, patch #24505