From 70360898be6df93e2fb37993d9490258336b4823 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Tue, 18 Jan 2011 15:52:10 +0000
Subject: [PATCH] Remove Mac OS classic code from tests in lib.

Including all @INC setting boilerplate from lib/Tie/ExtraHash.t, which TestInit
now performs.
---
 lib/AnyDBM_File.t   | 2 +-
 lib/Net/hostent.t   | 2 +-
 lib/Pod/t/Usage.t   | 3 +--
 lib/Tie/ExtraHash.t | 9 ---------
 lib/Unicode/UCD.t   | 1 -
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/lib/AnyDBM_File.t b/lib/AnyDBM_File.t
index 43405b9..d3c1c31 100644
--- a/lib/AnyDBM_File.t
+++ b/lib/AnyDBM_File.t
@@ -32,7 +32,7 @@ if (! -e $Dfile) {
 SKIP:
 {
     skip( "different file permission semantics",1)
-                      if ($Is_Dosish || $^O eq 'MacOS') ;
+                      if $Is_Dosish;
     ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
      $blksize,$blocks) = stat($Dfile);
     ok(($mode & 0777) == ($^O eq 'vos' ? 0750 : 0640) , "File permissions");
diff --git a/lib/Net/hostent.t b/lib/Net/hostent.t
index 421f19d..573136c 100644
--- a/lib/Net/hostent.t
+++ b/lib/Net/hostent.t
@@ -14,7 +14,7 @@ BEGIN {
     {
 	plan skip_all => "Test uses Socket, Socket not built";
     }
-    if ($^O eq 'MacOS' || ($^O eq 'irix' && $Config{osvers} == 5)) {
+    if ($^O eq 'irix' && $Config{osvers} == 5) {
 	plan skip_all => "Test relies on resolution of localhost, fails on $^O ($Config{osvers})";
     }
 }
diff --git a/lib/Pod/t/Usage.t b/lib/Pod/t/Usage.t
index 2cabb55a..92aaf2e 100644
--- a/lib/Pod/t/Usage.t
+++ b/lib/Pod/t/Usage.t
@@ -47,8 +47,7 @@ SKIP: {
     is( $$fake_out, $vbl_0, '-pathlist parameter' );
 }
 
-SKIP: { # Test exit status from pod2usage()
-    skip "Exit status broken on Mac OS", 1 if $^O eq 'MacOS';
+{ # Test exit status from pod2usage()
     my $exit = ($^O eq 'VMS' ? 2 : 42);
     my $dev_null = File::Spec->devnull;
     my $args = join ", ", (
diff --git a/lib/Tie/ExtraHash.t b/lib/Tie/ExtraHash.t
index c8e4630..bbaf64f 100644
--- a/lib/Tie/ExtraHash.t
+++ b/lib/Tie/ExtraHash.t
@@ -1,14 +1,5 @@
 #!./perl
 
-BEGIN {
-    chdir 't' if -d 't';
-    if ($^O eq 'MacOS') {
-        @INC = qw(: ::lib ::macos:lib);
-    } else {
-        @INC = '.';
-        push @INC, '../lib';
-    }
-}
 use strict;
 use warnings;
 use Test::More tests => 11;
diff --git a/lib/Unicode/UCD.t b/lib/Unicode/UCD.t
index 6f153ff..b764c6d 100644
--- a/lib/Unicode/UCD.t
+++ b/lib/Unicode/UCD.t
@@ -6,7 +6,6 @@ BEGIN {
     }
     chdir 't' if -d 't';
     @INC = '../lib';
-    @INC = "::lib" if $^O eq 'MacOS'; # module parses @INC itself
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bStorable\b/) {
         print "1..0 # Skip: Storable was not built; Unicode::UCD uses Storable\n";
-- 
2.7.4