Remove code specific to MacOS Classic from core tests

diff --git a/lib/FindBin.t b/lib/FindBin.t
index be6f58c..36e142c 100644 (file)
--- a/lib/FindBin.t
+++ b/lib/FindBin.t
@@ -10,12 +10,7 @@ print "1..2\n";
 use FindBin qw($Bin);
 
 print "# $Bin\n";
-
-if ($^O eq 'MacOS') {
-    print "not " unless $Bin =~ m,:lib:$,;
-} else {
-    print "not " unless $Bin =~ m,[/.]lib\]?$,;
-}
+print "not " unless $Bin =~ m,[/.]lib\]?$,;
 print "ok 1\n";
 
 $0 = "-";

diff --git a/lib/blib.t b/lib/blib.t
index a959471..2ad9827 100644 (file)
--- a/lib/blib.t
+++ b/lib/blib.t
@@ -29,7 +29,7 @@ if ($Is_VMS) {
 
 sub _cleanup {
     rmdir foreach reverse (@_);
-    unlink "stderr" unless $^O eq 'MacOS';
+    unlink "stderr";
 }
 
 sub _mkdirs {
@@ -41,21 +41,10 @@ sub _mkdirs {
     
 
 BEGIN {
-    if ($^O eq 'MacOS')
-    {
-       $MacPerl::Architecture = $MacPerl::Architecture; # shhhhh
-       $blib = ":blib:";
-       $blib_lib = ":blib:lib:";
-       $blib_arch = ":blib:lib:$MacPerl::Architecture:";
-       @blib_dirs = ($blib, $blib_lib, $blib_arch); # order
-    }
-    else
-    {
-       $blib = "blib";
-       $blib_arch = "blib/arch";
-       $blib_lib = "blib/lib";
-       @blib_dirs = ($blib, $blib_arch, $blib_lib);
-    }
+    $blib = "blib";
+    $blib_arch = "blib/arch";
+    $blib_lib = "blib/lib";
+    @blib_dirs = ($blib, $blib_arch, $blib_lib);
     _cleanup( @blib_dirs );
 }
 
@@ -82,7 +71,7 @@ if ($Is_VMS_mode) {
     $blib_arch = 'blib.arch]';
     $blib_lib = 'blib.lib]';
 }
-elsif ($^O ne 'MacOS')
+else
 {
     $blib_arch = File::Spec->catdir("blib","arch");
     $blib_lib  = File::Spec->catdir("blib","lib");

diff --git a/lib/charnames.t b/lib/charnames.t
index b3e4a46..f74453d 100644 (file)
--- a/lib/charnames.t
+++ b/lib/charnames.t
@@ -176,28 +176,14 @@ print "ok 24\n";
 print "not " unless "\N{NULL}" eq "\c@";
 print "ok 25\n";
 
-if ($^O eq 'MacOS')
-{
-       print "not " unless "\N{CARRIAGE RETURN (CR)}" eq "\n";
-       print "ok 26\n";
-
-       print "not " unless "\N{CARRIAGE RETURN}" eq "\n";
-       print "ok 27\n";
+print "not " unless "\N{LINE FEED (LF)}" eq "\n";
+print "ok 26\n";
 
-       print "not " unless "\N{CR}" eq "\n";
-       print "ok 28\n";
-}
-else
-{
-       print "not " unless "\N{LINE FEED (LF)}" eq "\n";
-       print "ok 26\n";
+print "not " unless "\N{LINE FEED}" eq "\n";
+print "ok 27\n";
 
-       print "not " unless "\N{LINE FEED}" eq "\n";
-       print "ok 27\n";
-
-       print "not " unless "\N{LF}" eq "\n";
-       print "ok 28\n";
-}
+print "not " unless "\N{LF}" eq "\n";
+print "ok 28\n";
 
 my $nel = ord("A") == 193 ? qr/^(?:\x15|\x25)$/ : qr/^\x85$/;
 
@@ -302,10 +288,6 @@ for (@prgs) {
     $res =~ s/\n%[A-Z]+-[SIWEF]-.*$//          # clip off DCL status msg
        if $^O eq "VMS";
     $exp =~ s/[\r\n]+$//;
-    if ($^O eq "MacOS") {
-       $exp =~ s{(\./)?abc\.pm}{:abc.pm}g;
-       $exp =~ s{./abc}        {:abc}g;
-       }
     my $pfx = ($res =~ s/^PREFIX\n//);
     my $rexp = qr{^$exp};
     if ($res =~ s/^SKIPPED\n//) {

diff --git a/lib/diagnostics.t b/lib/diagnostics.t
index d9855a9..f30f70e 100644 (file)
--- a/lib/diagnostics.t
+++ b/lib/diagnostics.t
@@ -1,13 +1,8 @@
 #!./perl
 
 BEGIN {
-    if ($^O eq 'MacOS') {
-       chdir '::' if -d '::pod' && -d '::t';
-       @INC = ':lib:';
-    } else {
-       chdir '..' if -d '../pod' && -d '../t';
-       @INC = 'lib';
-    }
+    chdir '..' if -d '../pod' && -d '../t';
+    @INC = 'lib';
 }
 
 use Test::More tests => 2;

diff --git a/lib/h2xs.t b/lib/h2xs.t
index 7d037f3..6ce37ee 100644 (file)
--- a/lib/h2xs.t
+++ b/lib/h2xs.t
@@ -53,7 +53,6 @@ if ($^O eq 'VMS') {
     }
     $Is_VMS_traildot = 0 if $drop_dot && unix_rpt;
 }
-if ($^O eq 'MacOS') { $extracted_program = '::utils:h2xs'; }
 if (!(-e $extracted_program)) {
     print "1..0 # Skip: $extracted_program was not built\n";
     exit 0;
@@ -65,13 +64,6 @@ if (!(-e $extracted_program)) {
 my $dupe = '2>&1';
 # ok on unix, nt, The extra \" are for VMS
 my $lib = '"-I../lib" "-I../../lib"';
-# The >&1 would create a file named &1 on MPW (STDERR && STDOUT are
-# already merged).
-if ($^O eq 'MacOS') {
-    $dupe = '';
-    # -x overcomes MPW $Config{startperl} anomaly
-    $lib = '-x -I::lib: -I:::lib:';
-}
 # $name should differ from system header file names and must
 # not already be found in the t/ subdirectory for perl.
 my $name = 'h2xst';
@@ -189,11 +181,6 @@ while (my ($args, $version, $expectation) = splice @tests, 0, 3) {
   cmp_ok ($?, "==", 0, "running $prog ");
   $result = join("",@result);
 
-  # accomodate MPW # comment character prependage
-  if ($^O eq 'MacOS') {
-    $result =~ s/#\s*//gs;
-  }
-
   #print "# expectation is >$expectation<\n";
   #print "# result is >$result<\n";
   # Was the output the list of files that were expected?
@@ -203,10 +190,6 @@ while (my ($args, $version, $expectation) = splice @tests, 0, 3) {
   find (sub {$got{$File::Find::name}++ unless -d $_}, $name);
 
   foreach ($expectation =~ /Writing\s+(\S+)/gm) {
-    if ($^O eq 'MacOS') {
-      $_ = ':' . join(':',split(/\//,$_));
-      $_ =~ s/$name:t:1.t/$name:t\/1.t/; # is this an h2xs bug?
-    }
     if ($^O eq 'VMS') {
       if ($Is_VMS_traildot) {
           $_ .= '.' unless $_ =~ m/\./;

diff --git a/lib/lib.t b/lib/lib.t
index 5d4ff3a..d39a656 100644 (file)
--- a/lib/lib.t
+++ b/lib/lib.t
@@ -52,13 +52,6 @@ use lib $Lib_Dir;
 BEGIN { use_ok('Yup') }
 
 BEGIN {
-    if ($^O eq 'MacOS') {
-       for ($Lib_Dir, $Arch_Dir) {
-           tr|/|:|;
-           $_ .= ":" unless /:$/;
-           $_ = ":$_" unless /^:/; # we know this path is relative
-       }
-    }
     is( $INC[1], $Lib_Dir,          'lib adding at end of @INC' );
     print "# \@INC == @INC\n";
     is( $INC[0], $Arch_Dir,        '    auto/ dir in front of that' );
@@ -67,9 +60,6 @@ BEGIN {
     # Yes, %INC uses Unixy filepaths.
     # Not on Mac OS, it doesn't ... it never has, at least.
     my $path = join("/",$Lib_Dir, 'Yup.pm');
-    if ($^O eq 'MacOS') {
-       $path = $Lib_Dir . 'Yup.pm';
-    }
     is( $INC{'Yup.pm'}, $path,    '%INC set properly' );
 
     is( eval { do 'Yup.pm'  }, 42,  'do() works' );

diff --git a/lib/open.t b/lib/open.t
index 4ce7371..b062ff3 100644 (file)
--- a/lib/open.t
+++ b/lib/open.t
@@ -3,7 +3,6 @@
 BEGIN {
        chdir 't' if -d 't';
        @INC = '../lib';
-       push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
        require Config; import Config;
 }
 

diff --git a/lib/strict.t b/lib/strict.t
index bfe6b63..93264ac 100644 (file)
--- a/lib/strict.t
+++ b/lib/strict.t
@@ -16,7 +16,7 @@ my $i = 0 ;
 
 my @prgs = () ;
 
-foreach (sort glob($^O eq 'MacOS' ? ":lib:strict:*" : "lib/strict/*")) {
+foreach (sort glob("lib/strict/*")) {
 
     next if -d || /(~|\.orig|,v)$/;
 
@@ -53,7 +53,6 @@ for (@prgs){
        while (@files > 2) {
            my $filename = shift @files ;
            my $code = shift @files ;
-           $code =~ s|\./abc|:abc|g if $^O eq 'MacOS';
            push @temps, $filename ;
            open F, ">$filename" or die "Cannot open $filename: $!\n" ;
            print F $code ;
@@ -61,7 +60,6 @@ for (@prgs){
        }
        shift @files ;
        $prog = shift @files ;
-       $prog =~ s|\./abc|:abc|g if $^O eq 'MacOS';
     }
     my $tmpfile = tempfile();
     open TEST, ">$tmpfile" or die "Could not open: $!";
@@ -71,8 +69,6 @@ for (@prgs){
                      `.\\perl -I../lib $switch $tmpfile 2>&1` :
                   $^O eq 'NetWare' ?
                      `perl -I../lib $switch $tmpfile 2>&1` :
-                  $^O eq 'MacOS' ?
-                     `$^X -I::lib -MMac::err=unix $switch $tmpfile` :
                   `$^X $switch $tmpfile 2>&1`;
     my $status = $?;
     $results =~ s/\n+$//;
@@ -80,8 +76,6 @@ for (@prgs){
     $results =~ s/tmp\d+[A-Z][A-Z]?/-/g;
     $results =~ s/\n%[A-Z]+-[SIWEF]-.*$// if $Is_VMS;  # clip off DCL status msg
     $expected =~ s/\n+$//;
-    $expected =~ s|(\./)?abc\.pm|:abc.pm|g if $^O eq 'MacOS';
-    $expected =~ s|./abc|:abc|g if $^O eq 'MacOS';
     my $prefix = ($results =~ s/^PREFIX\n//) ;
     my $TODO = $prog =~ m/^#\s*TODO:/;
     if ( $results =~ s/^SKIPPED\n//) {

diff --git a/lib/subs.t b/lib/subs.t
index b1999b2..709fcfa 100644 (file)
--- a/lib/subs.t
+++ b/lib/subs.t
@@ -15,7 +15,6 @@ print "1..", scalar @prgs, "\n";
 my $Is_VMS = $^O eq 'VMS';
 my $Is_MSWin32 = $^O eq 'MSWin32';
 my $Is_NetWare = $^O eq 'NetWare';
-my $Is_MacOS = $^O eq 'MacOS';
 my $i = 0 ;
 
 for (@prgs){
@@ -52,8 +51,6 @@ for (@prgs){
                      `.\\perl -I../lib $switch $tmpfile 2>&1` :
                  $Is_NetWare ?
                      `perl -I../lib $switch $tmpfile 2>&1` :
-                 $Is_MacOS ?
-                     `$^X -I::lib -MMac::err=unix $switch $tmpfile` :
                   `./perl $switch $tmpfile 2>&1`;
     my $status = $?;
     $results =~ s/\n+$//;

diff --git a/t/base/term.t b/t/base/term.t
index 83a32aa..7a16ffd 100644 (file)
--- a/t/base/term.t
+++ b/t/base/term.t
@@ -38,11 +38,7 @@ if (($x | 1) == 101) {print "ok 5\n";} else {print "not ok 5\n";}
 
 # check <> pseudoliteral
 
-if ($^O eq 'MacOS') {
-       open(try,"Dev:Null") || (die "Can't open /dev/null.");
-} else {
-       open(try, "/dev/null") || open(try,"nla0:") || (die "Can't open /dev/null.");
-}
+open(try, "/dev/null") || open(try,"nla0:") || (die "Can't open /dev/null.");
 
 if (<try> eq '') {
     print "ok 6\n";

diff --git a/t/comp/multiline.t b/t/comp/multiline.t
index 0409f8b..6976590 100644 (file)
--- a/t/comp/multiline.t
+++ b/t/comp/multiline.t
@@ -44,7 +44,6 @@ is($., 7,       '    $.' );
 
 $out = (($^O eq 'MSWin32') || $^O eq 'NetWare') ? `type $filename`
     : ($^O eq 'VMS') ? `type $filename.;0`   # otherwise .LIS is assumed
-    : ($^O eq 'MacOS') ? `catenate $filename`
     : `cat $filename`;
 
 like($out, qr/.*\n.*\n.*\n$/);

diff --git a/t/comp/use.t b/t/comp/use.t
index 8546123..6afc1f0 100755 (executable)
--- a/t/comp/use.t
+++ b/t/comp/use.t
@@ -131,35 +131,20 @@ is ($@, '');
 eval "use lib 1.01";
 isnt ($@, '');
 
-
 eval "use lib 0.9 qw(fred)";
 is ($@, '');
 
-if ($^O eq 'MacOS') {
-    is($INC[0], ":fred:");
-} else {
-    is($INC[0], "fred");
-}
+is($INC[0], "fred");
 
 eval "use lib 1.0 qw(joe)";
 is ($@, '');
 
-
-if ($^O eq 'MacOS') {
-    is($INC[0], ":joe:");
-} else {
-    is($INC[0], "joe");
-}
-
+is($INC[0], "joe");
 
 eval "use lib 1.01 qw(freda)";
 isnt($@, '');
 
-if ($^O eq 'MacOS') {
-    isnt($INC[0], ":freda:");
-} else {
-    isnt($INC[0], "freda");
-}
+isnt($INC[0], "freda");
 
 {
     local $lib::VERSION = 35.36;

diff --git a/t/io/dup.t b/t/io/dup.t
index ac2f3f4..1328aeb 100644 (file)
--- a/t/io/dup.t
+++ b/t/io/dup.t
@@ -35,16 +35,10 @@ $cmd = sprintf $echo, 4;
 print `$cmd`;
 
 $cmd = sprintf "$echo 1>&2", 5;
-$cmd = sprintf $echo, 5 if $^O eq 'MacOS';  # don't know if we can do this ...
 print `$cmd`;
 
 system sprintf $echo, 6;
-if ($^O eq 'MacOS') {
-    system sprintf $echo, 7;
-}
-else {
-    system sprintf "$echo 1>&2", 7;
-}
+system sprintf "$echo 1>&2", 7;
 
 close(STDOUT) or die "Could not close: $!";
 close(STDERR) or die "Could not close: $!";
@@ -54,8 +48,7 @@ open(STDERR,">&DUPERR") or die "Could not open: $!";
 
 if (($^O eq 'MSWin32') || ($^O eq 'NetWare')) { print `type $tempfile` }
 elsif ($^O eq 'VMS')   { system "type $tempfile.;" } # TYPE defaults to .LIS when there is no extension
-elsif ($^O eq 'MacOS') { system "catenate $tempfile" }
-else                   { system "cat $tempfile" }
+else { system "cat $tempfile" }
 
 print STDOUT "ok 8\n";
 

diff --git a/t/io/fs.t b/t/io/fs.t
index f5de9c5..ee32f63 100644 (file)
--- a/t/io/fs.t
+++ b/t/io/fs.t
@@ -9,7 +9,6 @@ BEGIN {
 use Config;
 use File::Spec::Functions;
 
-my $Is_MacOS  = ($^O eq 'MacOS');
 my $Is_VMSish = ($^O eq 'VMS');
 
 if (($^O eq 'MSWin32') || ($^O eq 'NetWare')) {
@@ -28,7 +27,7 @@ my $accurate_timestamps =
     !($^O eq 'MSWin32' || $^O eq 'NetWare' ||
       $^O eq 'dos'     || $^O eq 'os2'     ||
       $^O eq 'cygwin'  || $^O eq 'amigaos' ||
-         $wd =~ m#$Config{afsroot}/# || $Is_MacOS
+         $wd =~ m#$Config{afsroot}/#
      );
 
 if (defined &Win32::IsWinNT && Win32::IsWinNT()) {
@@ -63,9 +62,6 @@ elsif ($^O eq 'VMS') {
     `if f\$search("$tmpdir.dir") .nes. "" then delete/nolog/noconfirm $tmpdir.dir;`;
     `create/directory [.$tmpdir]`;
 }
-elsif ($Is_MacOS) {
-    rmdir "$tmpdir"; mkdir "$tmpdir";
-}
 else {
     `rm -f $tmpdir 2>/dev/null; mkdir $tmpdir 2>/dev/null`;
 }
@@ -77,7 +73,7 @@ chdir catdir(curdir(), $tmpdir);
 umask(022);
 
 SKIP: {
-    skip "bogus umask", 1 if ($^O eq 'MSWin32') || ($^O eq 'NetWare') || ($^O eq 'epoc') || $Is_MacOS;
+    skip "bogus umask", 1 if ($^O eq 'MSWin32') || ($^O eq 'NetWare') || ($^O eq 'epoc');
 
     is((umask(0)&0777), 022, 'umask'),
 }

diff --git a/t/io/open.t b/t/io/open.t
index 325d637..1a58327 100644 (file)
--- a/t/io/open.t
+++ b/t/io/open.t
@@ -9,7 +9,6 @@ BEGIN {
 $|  = 1;
 use warnings;
 use Config;
-$Is_MacOS = $^O eq 'MacOS';
 
 plan tests => 108;
 
@@ -84,9 +83,7 @@ EOC
     is( scalar @rows, 2,                '       readline, list context' );
     ok( close($f),                      '       close' );
 }
-SKIP: {
-    skip "Output for |- doesn't go to shell on MacOS", 5 if $Is_MacOS;
-
+{
     ok( open(my $f, '|-', <<EOC),     'open |-' );
     $Perl -pe "s/^not //"
 EOC
@@ -177,9 +174,7 @@ EOC
     ok( close($f),                      '       close' );
 }
 
-SKIP: {
-    skip "Output for |- doesn't go to shell on MacOS", 5 if $Is_MacOS;
-
+{
     ok( open(local $f, '|-', <<EOC),  'open local $f, "|-", ...' );
     $Perl -pe "s/^not //"
 EOC

diff --git a/t/io/openpid.t b/t/io/openpid.t
index 449a268..7503f34 100644 (file)
--- a/t/io/openpid.t
+++ b/t/io/openpid.t
@@ -13,7 +13,7 @@ BEGIN {
     require './test.pl';
 }
 
-if ($^O eq 'dos' || $^O eq 'MacOS') {
+if ($^O eq 'dos') {
     skip_all("no multitasking");
 }
 

diff --git a/t/japh/abigail.t b/t/japh/abigail.t
index ab2272b..6ff5358 100644 (file)
--- a/t/japh/abigail.t
+++ b/t/japh/abigail.t
@@ -34,8 +34,6 @@ BEGIN {
     undef &skip;
 }
 
-skip_all "Unhappy on MacOS" if $^O eq 'MacOS';
-
 #
 # ./test.pl does real evilness by jumping to a label.
 # This function copies the skip from ./test, omitting the goto.
@@ -256,8 +254,7 @@ truncate$0,-1+-s$0;exec$0;}}//rekcaH_lreP_rehtona_tsuJ
         close   $fh or die "Failed to close $progfile: $!\n";
 
         chmod 0755   => $progfile or die "Failed to chmod $progfile: $!\n";
-        my $command  = "./$progfile";
-           $command .= ' 2>&1' unless $^O eq 'MacOS';
+        my $command  = "./$progfile 2>&1";
         if ( $^O eq 'qnx' ) {
           skip "#!./perl not supported in QNX4";
           skip "#!./perl not supported in QNX4";

diff --git a/t/lib/common.pl b/t/lib/common.pl
index ef95c9d..8680b73 100644 (file)
--- a/t/lib/common.pl
+++ b/t/lib/common.pl
@@ -14,7 +14,6 @@ our $pragma_name;
 
 $| = 1;
 
-my $Is_MacOS = $^O eq 'MacOS';
 my $tmpfile = tempfile();
 
 my @prgs = () ;
@@ -22,11 +21,7 @@ my @w_files = () ;
 
 if (@ARGV)
   { print "ARGV = [@ARGV]\n" ;
-    if ($Is_MacOS) {
-      @w_files = map { s#^#:lib:$pragma_name:#; $_ } @ARGV
-    } else {
       @w_files = map { s#^#./lib/$pragma_name/#; $_ } @ARGV
-    }
   }
 else
   { @w_files = sort glob(catfile(curdir(), "lib", $pragma_name, "*")) }
@@ -107,12 +102,6 @@ for (@prgs){
        $prog = shift @files ;
     }
 
-    # fix up some paths
-    if ($Is_MacOS) {
-       $prog =~ s|require "./abc(d)?";|require ":abc$1";|g;
-       $prog =~ s|"\."|":"|g;
-    }
-
     open TEST, ">$tmpfile" or die "Cannot open >$tmpfile: $!";
     print TEST q{
         BEGIN {
@@ -141,12 +130,6 @@ for (@prgs){
     # allow all tests to run when there are leaks
     $results =~ s/Scalars leaked: \d+\n//g;
 
-    # fix up some paths
-    if ($Is_MacOS) {
-       $results =~ s|:abc\.pm\b|abc.pm|g;
-       $results =~ s|:abc(d)?\b|./abc$1|g;
-    }
-
     $expected =~ s/\n+$//;
     my $prefix = ($results =~ s#^PREFIX(\n|$)##) ;
     # any special options? (OPTIONS foo bar zap)

diff --git a/t/lib/warnings/doio b/t/lib/warnings/doio
index a7165ad..970f33a 100644 (file)
--- a/t/lib/warnings/doio
+++ b/t/lib/warnings/doio
@@ -171,15 +171,6 @@ Use of -l on filehandle STDIN at - line 3.
 Use of -l on filehandle $fh at - line 6.
 ########
 # doio.c [Perl_do_aexec5]
-BEGIN {
-    if ($^O eq 'MacOS') {
-       print <<EOM;
-SKIPPED
-# no exec on Mac OS
-EOM
-       exit;
-    }
-}
 use warnings 'io' ;
 exec "lskdjfalksdjfdjfkls","" ;
 no warnings 'io' ;
@@ -189,15 +180,6 @@ OPTION regex
 Can't exec "lskdjfalksdjfdjfkls": .+
 ########
 # doio.c [Perl_do_exec3]
-BEGIN {
-    if ($^O eq 'MacOS') {
-       print <<EOM;
-SKIPPED
-# no exec on Mac OS
-EOM
-       exit;
-    }
-}
 use warnings 'io' ;
 exec "lskdjfalksdjfdjfkls", "abc" ;
 no warnings 'io' ;
@@ -207,15 +189,6 @@ OPTION regex
 Can't exec "lskdjfalksdjfdjfkls(:? abc)?": .+
 ########
 # doio.c [win32_execvp]
-BEGIN {
-    if ($^O eq 'MacOS') {
-       print <<EOM;
-SKIPPED
-# no exec on Mac OS
-EOM
-       exit;
-    }
-}
 use warnings 'exec' ;
 exec $^X, "-e0" ;
 EXPECT

diff --git a/t/lib/warnings/mg b/t/lib/warnings/mg
index 8915c28..9e3652b 100644 (file)
--- a/t/lib/warnings/mg
+++ b/t/lib/warnings/mg
@@ -25,7 +25,7 @@ EXPECT
 ########
 # mg.c
 use warnings 'signal' ;
-if ($^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'VMS' || $^O eq 'MacOS') {
+if ($^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'VMS') {
     print "SKIPPED\n# $^O, can't kill() to raise()\n"; exit;
 }
 $|=1;
@@ -35,7 +35,7 @@ SIGINT handler "fred" not defined.
 ########
 # mg.c
 no warnings 'signal' ;
-if ($^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'VMS' || $^O eq 'MacOS') {
+if ($^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'VMS') {
     print "SKIPPED\n# $^O, can't kill() to raise()\n"; exit;
 }
 $|=1;

diff --git a/t/lib/warnings/op b/t/lib/warnings/op
index 64217c7..681ec16 100644 (file)
--- a/t/lib/warnings/op
+++ b/t/lib/warnings/op
@@ -765,20 +765,11 @@ EXPECT
 Hash %FRED missing the % in argument 1 of keys() at - line 3.
 ########
 # op.c
-BEGIN {
-    if ($^O eq 'MacOS') {
-       print <<EOM;
-SKIPPED
-# no exec on Mac OS
-EOM
-       exit;
-    }
-}
 use warnings 'syntax' ;
 exec "$^X -e 1" ; 
 my $a
 EXPECT
-Statement unlikely to be reached at - line 13.
+Statement unlikely to be reached at - line 4.
        (Maybe you meant system() when you said exec()?)
 ########
 # op.c
@@ -803,15 +794,6 @@ defined(%hash) is deprecated at - line 3.
        (Maybe you should just omit the defined()?)
 ########
 # op.c
-BEGIN {
-    if ($^O eq 'MacOS') {
-       print <<EOM;
-SKIPPED
-# no exec on Mac OS
-EOM
-       exit;
-    }
-}
 no warnings 'syntax' ;
 exec "$^X -e 1" ; 
 my $a

diff --git a/t/op/alarm.t b/t/op/alarm.t
index 8be24db..118ee9d 100644 (file)
--- a/t/op/alarm.t
+++ b/t/op/alarm.t
@@ -46,7 +46,7 @@ is( $@, "ALARM!\n",             'alarm w/$SIG{ALRM} vs system()' );
 
 {
     local $TODO = "Why does system() block alarm() on $^O?"
-               if $^O eq 'VMS' || $^O eq'MacOS' || $^O eq 'dos';
+               if $^O eq 'VMS' || $^O eq 'dos';
     ok( abs($diff - 3) <= 1,   "   right time (waited $diff secs for 3-sec alarm)" );
 }
 

diff --git a/t/op/anonsub.t b/t/op/anonsub.t
index 970440b..6b17aa0 100644 (file)
--- a/t/op/anonsub.t
+++ b/t/op/anonsub.t
@@ -8,7 +8,6 @@ chdir 't' if -d 't';
 @INC = '../lib';
 $Is_VMS = $^O eq 'VMS';
 $Is_MSWin32 = $^O eq 'MSWin32';
-$Is_MacOS = $^O eq 'MacOS';
 $Is_NetWare = $^O eq 'NetWare';
 $ENV{PERL5LIB} = "../lib" unless $Is_VMS;
 
@@ -35,11 +34,9 @@ for (@prgs){
                `$^X "-I[-.lib]" $switch $tmpfile 2>&1` :
                  $Is_MSWin32 ?
                    `.\\perl -I../lib $switch $tmpfile 2>&1` :
-                     $Is_MacOS ?  
-                       `$^X -I::lib $switch $tmpfile` :
-                           $Is_NetWare ?
-                               `perl -I../lib $switch $tmpfile 2>&1` :
-                                   `./perl $switch $tmpfile 2>&1`;
+                       $Is_NetWare ?
+                           `perl -I../lib $switch $tmpfile 2>&1` :
+                               `./perl $switch $tmpfile 2>&1`;
     my $status = $?;
     $results =~ s/\n+$//;
     # allow expected output to be written as if $prog is on STDIN

diff --git a/t/op/chdir.t b/t/op/chdir.t
index 7fc7665..a0c60bf 100644 (file)
--- a/t/op/chdir.t
+++ b/t/op/chdir.t
@@ -12,7 +12,6 @@ require "test.pl";
 plan(tests => 48);
 
 my $IsVMS   = $^O eq 'VMS';
-my $IsMacOS = $^O eq 'MacOS';
 
 my $vms_unix_rpt = 0;
 my $vms_efs = 0;
@@ -134,7 +133,7 @@ sub check_env {
     my($key) = @_;
 
     # Make sure $ENV{'SYS$LOGIN'} is only honored on VMS.
-    if( $key eq 'SYS$LOGIN' && !$IsVMS && !$IsMacOS ) {
+    if( $key eq 'SYS$LOGIN' && !$IsVMS ) {
         ok( !chdir(),         "chdir() on $^O ignores only \$ENV{$key} set" );
         is( abs_path, $Cwd,   '  abs_path() did not change' );
         pass( "  no need to test SYS\$LOGIN on $^O" ) for 1..7;
@@ -182,10 +181,8 @@ sub clean_env {
         next if $IsVMS && $env eq 'SYS$LOGIN';
         next if $IsVMS && $env eq 'HOME' && !$Config{'d_setenv'};
 
-        unless ($IsMacOS) { # ENV on MacOS is "special" :-)
-            # On VMS, %ENV is many layered.
-            delete $ENV{$env} while exists $ENV{$env};
-        }
+       # On VMS, %ENV is many layered.
+       delete $ENV{$env} while exists $ENV{$env};
     }
 
     # The following means we won't really be testing for non-existence,
@@ -218,7 +215,7 @@ foreach my $key (@magic_envs) {
 
 {
     clean_env;
-    if (($IsVMS || $IsMacOS) && !$Config{'d_setenv'}) {
+    if ($IsVMS && !$Config{'d_setenv'}) {
         pass("Can't reset HOME, so chdir() test meaningless");
     } else {
         ok( !chdir(),                   'chdir() w/o any ENV set' );

diff --git a/t/op/defins.t b/t/op/defins.t
index fd073cf..1e8beb0 100644 (file)
--- a/t/op/defins.t
+++ b/t/op/defins.t
@@ -34,7 +34,7 @@ if ($^O eq 'VMS') {
 }
 
 $wanted_filename = $unix_mode ? '0' : '0.';
-$saved_filename = $^O eq 'MacOS' ? ':0' : './0';
+$saved_filename = './0';
 
 cmp_ok($warns,'==',0,'no warns at start');
 
@@ -81,7 +81,7 @@ while ($where{$seen} = <FILE>)
 cmp_ok($seen,'==',1,'seen in hash while()');
 close FILE;
 
-opendir(DIR,($^O eq 'MacOS' ? ':' : '.'));
+opendir(DIR,'.');
 ok(defined(DIR),'opened current directory');
 $seen = 0;
 while (my $name = readdir(DIR))

diff --git a/t/op/exec.t b/t/op/exec.t
index 91821aa..73e9a9c 100644 (file)
--- a/t/op/exec.t
+++ b/t/op/exec.t
@@ -36,8 +36,6 @@ $ENV{LANGUAGE} = 'C';         # Ditto in GNU.
 my $Is_VMS   = $^O eq 'VMS';
 my $Is_Win32 = $^O eq 'MSWin32';
 
-skip_all("Tests mostly usesless on MacOS") if $^O eq 'MacOS';
-
 plan(tests => 22);
 
 my $Perl = which_perl();

diff --git a/t/op/glob.t b/t/op/glob.t
index fd542cb..7a42f12 100644 (file)
--- a/t/op/glob.t
+++ b/t/op/glob.t
@@ -18,11 +18,6 @@ elsif ($^O eq 'VMS') {
   map { $files{lc($_)}++ } <[.op]*>;
   map { s/;.*$//; delete $files{lc($_)}; } split /[\n]/, `directory/noheading/notrailing/versions=1 [.op]`,
 }
-elsif ($^O eq 'MacOS') {
-  @oops = @ops = <:op:*>;
-  map { $files{$_}++ } <:op:*>;
-  map { delete $files{$_} } split /[\s\n]/, `echo :op:\xc5`;
-}
 else {
   map { $files{$_}++ } <op/*>;
   map { delete $files{$_} } split /[\s\n]/, `echo op/*`;
@@ -32,22 +27,15 @@ ok( !(keys(%files)),'leftover op/* files' ) or diag(join(' ',sort keys %files));
 cmp_ok($/,'eq',"\n",'sane input record separator');
 
 $not = '';
-if ($^O eq 'MacOS') {
-    while (<jskdfjskdfj* :op:* jskdjfjkosvk*>) {
-       $not = "not " unless $_ eq shift @ops;
-       $not = "not at all " if $/ eq "\0";
-    }
-} else {
-    while (<jskdfjskdfj* op/* jskdjfjkosvk*>) {
-       $not = "not " unless $_ eq shift @ops;
-       $not = "not at all " if $/ eq "\0";
-    }
+while (<jskdfjskdfj* op/* jskdjfjkosvk*>) {
+    $not = "not " unless $_ eq shift @ops;
+    $not = "not at all " if $/ eq "\0";
 }
 ok(!$not,"glob amid garbage [$not]");
 
 cmp_ok($/,'eq',"\n",'input record separator still sane');
 
-$_ = $^O eq 'MacOS' ? ":op:*" : "op/*";
+$_ = "op/*";
 @glops = glob $_;
 cmp_ok("@glops",'eq',"@oops",'glob operator 1');
 

diff --git a/t/op/inccode.t b/t/op/inccode.t
index 60c3581..7edb345 100644 (file)
--- a/t/op/inccode.t
+++ b/t/op/inccode.t
@@ -196,7 +196,7 @@ $ret ||= do 'abc.pl';
 is( $ret, 'abc', 'do "abc.pl" sees return value' );
 
 {
-    my $filename = $^O eq 'MacOS' ? ':Foo:Foo.pm' : './Foo.pm';
+    my $filename = './Foo.pm';
     #local @INC; # local fails on tied @INC
     my @old_INC = @INC; # because local doesn't work on tied arrays
     @INC = sub { $filename = 'seen'; return undef; };

diff --git a/t/op/magic.t b/t/op/magic.t
index f8143a2..6e3da53 100644 (file)
--- a/t/op/magic.t
+++ b/t/op/magic.t
@@ -20,14 +20,13 @@ $Is_VMS      = $^O eq 'VMS';
 $Is_Dos      = $^O eq 'dos';
 $Is_os2      = $^O eq 'os2';
 $Is_Cygwin   = $^O eq 'cygwin';
-$Is_MacOS    = $^O eq 'MacOS';
 $Is_MPE      = $^O eq 'mpeix';         
 $Is_miniperl = $ENV{PERL_CORE_MINITEST};
 $Is_BeOS     = $^O eq 'beos';
 
 $PERL = $ENV{PERL}
     || ($Is_NetWare           ? 'perl'   :
-       ($Is_MacOS || $Is_VMS) ? $^X      :
+       $Is_VMS                ? $^X      :
        $Is_MSWin32            ? '.\perl' :
        './perl');
 
@@ -40,7 +39,6 @@ eval '$ENV{"FOO"} = "hi there";';     # check that ENV is inited inside eval
 # cmd.exe will echo 'variable=value' but 4nt will echo just the value
 # -- Nikola Knezevic
 if ($Is_MSWin32)  { like `set FOO`, qr/^(?:FOO=)?hi there$/; }
-elsif ($Is_MacOS) { ok "1 # skipped", 1; }
 elsif ($Is_VMS)   { is `write sys\$output f\$trnlnm("FOO")`, "hi there\n"; }
 else              { is `echo \$FOO`, "hi there\n"; }
 
@@ -52,7 +50,7 @@ close FOO; # just mention it, squelch used-only-once
 
 SKIP: {
     skip('SIGINT not safe on this platform', 5)
-       if $Is_MSWin32 || $Is_NetWare || $Is_Dos || $Is_MPE || $Is_MacOS;
+       if $Is_MSWin32 || $Is_NetWare || $Is_Dos || $Is_MPE;
   # the next tests are done in a subprocess because sh spits out a
   # newline onto stderr when a child process kills itself with SIGINT.
   # We use a pipe rather than system() because the VMS command buffer
@@ -163,13 +161,10 @@ is((keys %h)[0], "foo\034bar");
 }
 
 # $?, $@, $$
-SKIP:  {
-    skip('$? + system are broken on MacPerl', 2) if $Is_MacOS;
-    system qq[$PERL "-I../lib" -e "use vmsish qw(hushed); exit(0)"];
-    is $?, 0;
-    system qq[$PERL "-I../lib" -e "use vmsish qw(hushed); exit(1)"];
-    isnt $?, 0;
-}
+system qq[$PERL "-I../lib" -e "use vmsish qw(hushed); exit(0)"];
+is $?, 0;
+system qq[$PERL "-I../lib" -e "use vmsish qw(hushed); exit(1)"];
+isnt $?, 0;
 
 eval { die "foo\n" };
 is $@, "foo\n";
@@ -195,13 +190,10 @@ like ($@, qr/^Modification of a read-only value attempted/);
     elsif($Is_os2) {
        $wd = Cwd::sys_cwd();
     }
-    elsif($Is_MacOS) {
-       $wd = ':';
-    }
     else {
        $wd = '.';
     }
-    my $perl = ($Is_MacOS || $Is_VMS) ? $^X : "$wd/perl";
+    my $perl = $Is_VMS ? $^X : "$wd/perl";
     my $headmaybe = '';
     my $middlemaybe = '';
     my $tailmaybe = '';
@@ -227,9 +219,6 @@ EOT
     elsif ($Is_os2) {
       $script = "./show-shebang";
     }
-    elsif ($Is_MacOS) {
-      $script = ":show-shebang";
-    }
     elsif ($Is_VMS) {
       $script = "[]show-shebang";
     }
@@ -254,7 +243,7 @@ print "\$^X is $^X, \$0 is $0\n";
 EOF
     ok close(SCRIPT) or diag $!;
     ok chmod(0755, $script) or diag $!;
-    $_ = ($Is_MacOS || $Is_VMS) ? `$perl $script` : `$script`;
+    $_ = $Is_VMS ? `$perl $script` : `$script`;
     s/\.exe//i if $Is_Dos or $Is_Cygwin or $Is_os2;
     s{./$script}{$script} if $Is_BeOS; # revert BeOS execvp() side-effect
     s{\bminiperl\b}{perl}; # so that test doesn't fail with miniperl
@@ -292,7 +281,7 @@ $^O = $orig_osname;
 
 SKIP: {
     skip("%ENV manipulations fail or aren't safe on $^O", 4)
-       if $Is_VMS || $Is_Dos || $Is_MacOS;
+       if $Is_VMS || $Is_Dos;
 
  SKIP: {
        skip("clearing \%ENV is not safe when running under valgrind")

diff --git a/t/op/method.t b/t/op/method.t
index 46c4642..afa8cfb 100644 (file)
--- a/t/op/method.t
+++ b/t/op/method.t
@@ -284,7 +284,6 @@ for my $meth (['Bar', 'Foo::Bar'],
 {
     fresh_perl_is(<<EOT,
 package UNIVERSAL; sub AUTOLOAD { my \$c = shift; print "\$c \$AUTOLOAD\\n" }
-sub DESTROY {} # IO object destructor called in MacOS, because of Mac::err
 package Xyz;
 package main; Foo->$meth->[0]();
 EOT

diff --git a/t/op/mkdir.t b/t/op/mkdir.t
index 6c71e68..bd0d1b4 100644 (file)
--- a/t/op/mkdir.t
+++ b/t/op/mkdir.t
@@ -25,15 +25,11 @@ like($!, qr/cannot find|such|exist|not found|not a directory|unknown/i);
 ok(mkdir('blurfl'));
 ok(rmdir('blurfl'));
 
-SKIP: {
-    # trailing slashes will be removed before the system call to mkdir
-    # but we don't care for MacOS ...
-    skip("MacOS", 4) if $^O eq 'MacOS';
-    ok(mkdir('blurfl///'));
-    ok(-d 'blurfl');
-    ok(rmdir('blurfl///'));
-    ok(!-d 'blurfl');
-}
+# trailing slashes will be removed before the system call to mkdir
+ok(mkdir('blurfl///'));
+ok(-d 'blurfl');
+ok(rmdir('blurfl///'));
+ok(!-d 'blurfl');
 
 # test default argument
 

diff --git a/t/op/readdir.t b/t/op/readdir.t
index 9aac087..8bf5610 100644 (file)
--- a/t/op/readdir.t
+++ b/t/op/readdir.t
@@ -34,13 +34,12 @@ else {
 
 @R = sort @D;
 @G = sort <op/*.t>;
-@G = sort <:op:*.t> if $^O eq 'MacOS';
 if ($G[0] =~ m#.*\](\w+\.t)#i) {
     # grep is to convert filespecs returned from glob under VMS to format
     # identical to that returned by readdir
     @G = grep(s#.*\](\w+\.t).*#op/$1#i,<op/*.t>);
 }
-while (@R && @G && $G[0] eq ($^O eq 'MacOS' ? ':op:' : 'op/').$R[0]) {
+while (@R && @G && $G[0] eq 'op/'.$R[0]) {
        shift(@R);
        shift(@G);
 }

diff --git a/t/op/recurse.t b/t/op/recurse.t
index 10830e6..2a0201a 100644 (file)
--- a/t/op/recurse.t
+++ b/t/op/recurse.t
@@ -125,13 +125,7 @@ is(takeuchi($x, $y, $z), $z + 1, "takeuchi($x, $y, $z) == $z + 1");
       skip("Out of memory -- increase your data/heap?", 2)
          if $r =~ /Out of memory/i;
       is($r, '', "64K deep recursion - no output expected");
-
-      if ($^O eq 'MacOS') {
-          ok(1, "$^O: \$? is unreliable");
-      } else {
-          is($?, 0, "64K deep recursion - no coredump expected");
-      }
-
+      is($?, 0, "64K deep recursion - no coredump expected");
   }
 }
 

diff --git a/t/op/runlevel.t b/t/op/runlevel.t
index 44aedc0..8b0429f 100644 (file)
--- a/t/op/runlevel.t
+++ b/t/op/runlevel.t
@@ -12,7 +12,6 @@ require './test.pl';
 $Is_VMS = $^O eq 'VMS';
 $Is_MSWin32 = $^O eq 'MSWin32';
 $Is_NetWare = $^O eq 'NetWare';
-$Is_MacOS = $^O eq 'MacOS';
 $ENV{PERL5LIB} = "../lib" unless $Is_VMS;
 
 $|=1;
@@ -38,8 +37,6 @@ for (@prgs){
                      `.\\perl -I../lib $switch $tmpfile 2>&1` :
                  $Is_NetWare ?  
                      `perl -I../lib $switch $tmpfile 2>&1` :
-                 $Is_MacOS ?
-                     `$^X -I::lib -MMac::err=unix $switch $tmpfile` :
                  `./perl $switch $tmpfile 2>&1`;
     my $status = $?;
     $results =~ s/\n+$//;

diff --git a/t/op/stat.t b/t/op/stat.t
index a225de4..007869e 100644 (file)
--- a/t/op/stat.t
+++ b/t/op/stat.t
@@ -17,7 +17,6 @@ $Is_Amiga   = $^O eq 'amigaos';
 $Is_Cygwin  = $^O eq 'cygwin';
 $Is_Darwin  = $^O eq 'darwin';
 $Is_Dos     = $^O eq 'dos';
-$Is_MacOS   = $^O eq 'MacOS';
 $Is_MPE     = $^O eq 'mpeix';
 $Is_MSWin32 = $^O eq 'MSWin32';
 $Is_NetWare = $^O eq 'NetWare';
@@ -64,7 +63,7 @@ SKIP: {
 
 SKIP: {
   skip "mtime and ctime not reliable", 2
-    if $Is_MSWin32 or $Is_NetWare or $Is_Cygwin or $Is_Dos or $Is_MacOS or $Is_Darwin;
+    if $Is_MSWin32 or $Is_NetWare or $Is_Cygwin or $Is_Dos or $Is_Darwin;
 
   ok( $mtime,           'mtime' );
   is( $mtime, $ctime,   'mtime == ctime' );
@@ -188,7 +187,7 @@ ok(-w $tmpfile,     '   -w');
 
 SKIP: {
     skip "-x simply determines if a file ends in an executable suffix", 1
-      if $Is_Dosish || $Is_MacOS;
+      if $Is_Dosish;
 
     ok(-x $tmpfile,     '   -x');
 }

diff --git a/t/op/study.t b/t/op/study.t
index 17c59da..b407c6f 100644 (file)
--- a/t/op/study.t
+++ b/t/op/study.t
@@ -104,7 +104,7 @@ ok(/^$_$/);
 # used to be a test for $*
 ok("ab\ncd\n" =~ /^cd/m);
 
-if ($^O eq 'os390' or $^O eq 'posix-bc' or $^O eq 'MacOS') {
+if ($^O eq 'os390' or $^O eq 'posix-bc') {
     # Even with the alarm() OS/390 and BS2000 can't manage these tests
     # (Perl just goes into a busy loop, luckily an interruptable one)
     for (25..26) { print "not ok $_ # TODO compiler bug?\n" }

diff --git a/t/op/substT.t b/t/op/substT.t
index 82e0354..5d02692 100644 (file)
--- a/t/op/substT.t
+++ b/t/op/substT.t
@@ -2,7 +2,7 @@
 
 for $file ('op/subst.t', 't/op/subst.t', ':op:subst.t') {
   if (-r $file) {
-    do ($^O eq 'MacOS' ? $file : "./$file");
+    do "./$file";
     exit;
   }
 }

diff --git a/t/op/subst_wamp.t b/t/op/subst_wamp.t
index 5e1b826..1207343 100644 (file)
--- a/t/op/subst_wamp.t
+++ b/t/op/subst_wamp.t
@@ -3,7 +3,7 @@
 $dummy = defined $&;           # Now we have it...
 for $file ('op/subst.t', 't/op/subst.t', ':op:subst.t') {
   if (-r $file) {
-    do ($^O eq 'MacOS' ? $file : "./$file");
+    do "./$file";
     exit;
   }
 }

diff --git a/t/op/taint.t b/t/op/taint.t
index 87592d5..796b6fa 100644 (file)
--- a/t/op/taint.t
+++ b/t/op/taint.t
@@ -42,7 +42,6 @@ BEGIN {
   }
 }
 
-my $Is_MacOS    = $^O eq 'MacOS';
 my $Is_VMS      = $^O eq 'VMS';
 my $Is_MSWin32  = $^O eq 'MSWin32';
 my $Is_NetWare  = $^O eq 'NetWare';
@@ -51,8 +50,7 @@ my $Is_Cygwin   = $^O eq 'cygwin';
 my $Is_OpenBSD  = $^O eq 'openbsd';
 my $Invoke_Perl = $Is_VMS      ? 'MCR Sys$Disk:[]Perl.exe' :
                   $Is_MSWin32  ? '.\perl'               :
-                  $Is_MacOS    ? ':perl'                :
-                  $Is_NetWare  ? 'perl'                 : 
+                  $Is_NetWare  ? 'perl'                 :
                                  './perl'               ;
 my @MoreEnv = qw/IFS CDPATH ENV BASH_ENV/;
 
@@ -134,7 +132,7 @@ sub test ($;$) {
 }
 
 # We need an external program to call.
-my $ECHO = ($Is_MSWin32 ? ".\\echo$$" : $Is_MacOS ? ":echo$$" : ($Is_NetWare ? "echo$$" : "./echo$$"));
+my $ECHO = ($Is_MSWin32 ? ".\\echo$$" : ($Is_NetWare ? "echo$$" : "./echo$$"));
 END { unlink $ECHO }
 open PROG, "> $ECHO" or die "Can't create $ECHO: $!";
 print PROG 'print "@ARGV\n"', "\n";
@@ -173,7 +171,7 @@ my $TEST = catfile(curdir(), 'TEST');
 
     SKIP: {
         skip "Environment tainting tests skipped", 4
-          if $Is_MSWin32 || $Is_NetWare || $Is_VMS || $Is_Dos || $Is_MacOS;
+          if $Is_MSWin32 || $Is_NetWare || $Is_VMS || $Is_Dos;
 
        my @vars = ('PATH', @MoreEnv);
        while (my $v = $vars[0]) {
@@ -627,7 +625,6 @@ SKIP: {
        unlink($symlink);
        my $sl = "/something/naughty";
        # it has to be a real path on Mac OS
-       $sl = MacPerl::MakePath((MacPerl::Volumes())[0]) if $Is_MacOS;
        symlink($sl, $symlink) or die "symlink: $!\n";
        my $readlink = readlink($symlink);
        test tainted $readlink;
@@ -972,15 +969,11 @@ TODO: {
     };
     test !$@;
 
-    SKIP: {
-        skip "no exec() on MacOS Classic" if $Is_MacOS;
-
-       eval { 
-            no warnings;
-            exec("lskdfj does not exist","with","args"); 
-        };
-       test !$@;
-    }
+    eval {
+       no warnings;
+       exec("lskdfj does not exist","with","args"); 
+    };
+    test !$@;
 
     # If you add tests here update also the above skip block for VMS.
 }

diff --git a/t/op/time.t b/t/op/time.t
index 2ea1733..0f2dd66 100644 (file)
--- a/t/op/time.t
+++ b/t/op/time.t
@@ -44,7 +44,7 @@ ok(localtime() =~ /^(Sun|Mon|Tue|Wed|Thu|Fri|Sat)[ ]
 SKIP: {
     # This conditional of "No tzset()" is stolen from ext/POSIX/t/time.t
     skip "No tzset()", 1
-        if $^O eq "MacOS" || $^O eq "VMS" || $^O eq "cygwin" ||
+        if $^O eq "VMS" || $^O eq "cygwin" ||
            $^O eq "djgpp" || $^O eq "MSWin32" || $^O eq "dos" ||
            $^O eq "interix";
 

diff --git a/t/op/write.t b/t/op/write.t
index f13ac5f..8c2bc54 100644 (file)
--- a/t/op/write.t
+++ b/t/op/write.t
@@ -637,7 +637,7 @@ EOP
 # Just a complete test for format, including top-, left- and bottom marging
 # and format detection through glob entries
 
-if ($^O eq 'VMS' || $^O eq 'MSWin32' || $^O eq 'dos' || $^O eq 'MacOS' ||
+if ($^O eq 'VMS' || $^O eq 'MSWin32' || $^O eq 'dos' ||
     ($^O eq 'os2' and not eval '$OS2::can_fork')) {
   $test = curr_test();
  SKIP: {

diff --git a/t/pod/testp2pt.pl b/t/pod/testp2pt.pl
index a828e85..bec55e4 100644 (file)
--- a/t/pod/testp2pt.pl
+++ b/t/pod/testp2pt.pl
@@ -38,9 +38,7 @@ sub catfile(@) { File::Spec->catfile(@_); }
 my $INSTDIR = abs_path(dirname $0);
 $INSTDIR = VMS::Filespec::unixpath($INSTDIR) if $^O eq 'VMS';
 $INSTDIR =~ s#/$## if $^O eq 'VMS';
-$INSTDIR =~ s#:$## if $^O eq 'MacOS';
 $INSTDIR = (dirname $INSTDIR) if (basename($INSTDIR) eq 'pod');
-$INSTDIR =~ s#:$## if $^O eq 'MacOS';
 $INSTDIR = (dirname $INSTDIR) if (basename($INSTDIR) eq 't');
 my @PODINCDIRS = ( catfile($INSTDIR, 'lib', 'Pod'),
                    catfile($INSTDIR, 'scripts'),

diff --git a/t/run/cloexec.t b/t/run/cloexec.t
index 769609a..314d5fa 100644 (file)
--- a/t/run/cloexec.t
+++ b/t/run/cloexec.t
@@ -48,11 +48,9 @@ use strict;
 $|=1;
 
 my $Is_VMS      = $^O eq 'VMS';
-my $Is_MacOS    = $^O eq 'MacOS';
 my $Is_Win32    = $^O eq 'MSWin32';
 
 # When in doubt, skip.
-skip_all("MacOS")    if $Is_MacOS;
 skip_all("VMS")      if $Is_VMS;
 skip_all("Win32")    if $Is_Win32;
 

diff --git a/t/run/exit.t b/t/run/exit.t
index b58dd45..02e57c6 100644 (file)
--- a/t/run/exit.t
+++ b/t/run/exit.t
@@ -16,8 +16,7 @@ sub run {
 }
 
 BEGIN {
-    # MacOS system() doesn't have good return value
-    $numtests = ($^O eq 'VMS') ? 16 : ($^O eq 'MacOS') ? 0 : 17;
+    $numtests = ($^O eq 'VMS') ? 16 : 17;
 }
 
 
@@ -46,7 +45,6 @@ plan(tests => $numtests);
 my $native_success = 0;
    $native_success = 1 if $^O eq 'VMS';
 
-if ($^O ne 'MacOS') {
 my $exit, $exit_arg;
 
 $exit = run('exit');
@@ -168,4 +166,3 @@ $exit = run("END { \$? = $exit_arg }");
 $exit_arg = (44 & 7) if $vms_exit_mode;
 
 is( $exit >> 8, $exit_arg,             'Changing $? in END block' );
-}

diff --git a/t/run/fresh_perl.t b/t/run/fresh_perl.t
index a67f47e..ce9ad5a 100644 (file)
--- a/t/run/fresh_perl.t
+++ b/t/run/fresh_perl.t
@@ -93,7 +93,7 @@ EXPECT
 ########
 eval 'sub bar {print "In bar"}';
 ########
-system './perl -ne "print if eof" /dev/null' unless $^O eq 'MacOS'
+system './perl -ne "print if eof" /dev/null'
 ########
 chop($file = <DATA>);
 ########
@@ -275,7 +275,7 @@ print "ok\n" if ("\0" lt "\xFF");
 EXPECT
 ok
 ########
-open(H,$^O eq 'MacOS' ? ':run:fresh_perl.t' : 'run/fresh_perl.t'); # must be in the 't' directory
+open(H,'run/fresh_perl.t'); # must be in the 't' directory
 stat(H);
 print "ok\n" if (-e _ and -f _ and -r _);
 EXPECT

diff --git a/t/run/switchI.t b/t/run/switchI.t
index 398f816..ffee2f9 100644 (file)
--- a/t/run/switchI.t
+++ b/t/run/switchI.t
@@ -10,24 +10,23 @@ BEGIN {
     plan(4);
 }
 
-my $Is_MacOS = $^O eq 'MacOS';
 my $Is_VMS   = $^O eq 'VMS';
 my $lib;
 
-$lib = $Is_MacOS ? ':Bla:' : 'Bla';
+$lib = 'Bla';
 ok(grep { $_ eq $lib } @INC[0..($#INC-1)]);
 SKIP: {
   skip 'Double colons not allowed in dir spec', 1 if $Is_VMS;
-  $lib = $Is_MacOS ? 'Foo::Bar:' : 'Foo::Bar';
+  $lib = 'Foo::Bar';
   ok(grep { $_ eq $lib } @INC[0..($#INC-1)]);
 }
 
-$lib = $Is_MacOS ? ':Bla2:' : 'Bla2';
+$lib = 'Bla2';
 fresh_perl_is("print grep { \$_ eq '$lib' } \@INC[0..(\$#INC-1)]", $lib,
              { switches => ['-IBla2'] }, '-I');
 SKIP: {
   skip 'Double colons not allowed in dir spec', 1 if $Is_VMS;
-  $lib = $Is_MacOS ? 'Foo::Bar2:' : 'Foo::Bar2';
+  $lib = 'Foo::Bar2';
   fresh_perl_is("print grep { \$_ eq '$lib' } \@INC", $lib,
                { switches => ['-IFoo::Bar2'] }, '-I with colons');
 }

diff --git a/t/test.pl b/t/test.pl
index 8390e83..8302236 100644 (file)
--- a/t/test.pl
+++ b/t/test.pl
@@ -405,7 +405,6 @@ USE_OK
 
 my $is_mswin    = $^O eq 'MSWin32';
 my $is_netware  = $^O eq 'NetWare';
-my $is_macos    = $^O eq 'MacOS';
 my $is_vms      = $^O eq 'VMS';
 my $is_cygwin   = $^O eq 'cygwin';
 
@@ -431,14 +430,7 @@ sub _create_runperl { # Create the string to qx in runperl().
        $runperl = "$ENV{PERL_RUNPERL_DEBUG} $runperl";
     }
     unless ($args{nolib}) {
-       if ($is_macos) {
-           $runperl .= ' -I::lib';
-           # Use UNIX style error messages instead of MPW style.
-           $runperl .= ' -MMac::err=unix' if $args{stderr};
-       }
-       else {
-           $runperl .= ' "-I../lib"'; # doublequotes because of VMS
-       }
+       $runperl .= ' "-I../lib"'; # doublequotes because of VMS
     }
     if ($args{switches}) {
        local $Level = 2;
@@ -481,19 +473,6 @@ sub _create_runperl { # Create the string to qx in runperl().
            $runperl = qq{$Perl -e "print qq(} .
                $args{stdin} . q{)" | } . $runperl;
        }
-       elsif ($is_macos) {
-           # MacOS can only do two processes under MPW at once;
-           # the test itself is one; we can't do two more, so
-           # write to temp file
-           my $stdin = qq{$Perl -e 'print qq(} . $args{stdin} . qq{)' > teststdin; };
-           if ($args{verbose}) {
-               my $stdindisplay = $stdin;
-               $stdindisplay =~ s/\n/\n\#/g;
-               _print_stderr "# $stdindisplay\n";
-           }
-           `$stdin`;
-           $runperl .= q{ < teststdin };
-       }
        else {
            $runperl = qq{$Perl -e 'print qq(} .
                $args{stdin} . q{)' | } . $runperl;
@@ -502,8 +481,7 @@ sub _create_runperl { # Create the string to qx in runperl().
     if (defined $args{args}) {
        _quote_args(\$runperl, $args{args});
     }
-    $runperl .= ' 2>&1'          if  $args{stderr} && !$is_macos;
-    $runperl .= " \xB3 Dev:Null" if !$args{stderr} &&  $is_macos;
+    $runperl .= ' 2>&1' if $args{stderr};
     if ($args{verbose}) {
        my $runperldisplay = $runperl;
        $runperldisplay =~ s/\n/\n\#/g;

diff --git a/t/x2p/s2p.t b/t/x2p/s2p.t
index 20000bf..bad1633 100644 (file)
--- a/t/x2p/s2p.t
+++ b/t/x2p/s2p.t
@@ -806,9 +806,6 @@ my $sedcmd = [ $psed, '-f', $script, $stdin ];
 my $s2pcmd = [ $s2p,  '-f', $script ];
 my $plcmd  = [ $plsed, $stdin ];
 
-my $switches = '';
-$switches = ['-x'] if $^O eq 'MacOS';
-
 # psed: we create a local copy as linking may not work on some systems.
 copy( $s2p, $psed );
 push( @aux, $psed );
@@ -852,19 +849,19 @@ for my $tc ( sort keys %testcase ){
 
     # run and compare
     #
-    $psedres = runperl( args => $sedcmd, switches => $switches );
+    $psedres = runperl( args => $sedcmd );
     is( $psedres, $testcase{$tc}{expect}, "psed $tc" );
 
     # 2nd test: run s2p
     # translate the sed script to a Perl program
 
-    my $perlprog = runperl( args => $s2pcmd, switches => $switches );
+    my $perlprog = runperl( args => $s2pcmd );
     open( PP, ">$plsed" ) || goto FAIL_S2P;
     print PP $perlprog;
     close( PP ) || goto FAIL_S2P;
 
     # execute generated Perl program, compare
-    $s2pres = runperl( args => $plcmd, switches => $switches );
+    $s2pres = runperl( args => $plcmd );
     is( $s2pres, $testcase{$tc}{expect}, "s2p $tc" );
     next;