Remove MacOS 9 support code from XS-APItest

EUMM dropped support for it ages ago, and so did perl core a couple of releases
back. This is an attempt to stop MacOS 9 support from being cargo-culted into
new XS-APItest tests.

12 files changed, 2 insertions, 19 deletions

diff --git a/ext/XS-APItest/t/call.t b/ext/XS-APItest/t/call.t
index 373a1af907..974bea6828 100644
--- a/ext/XS-APItest/t/call.t
+++ b/ext/XS-APItest/t/call.t
@@ -4,11 +4,9 @@
 # DAPM Aug 2004
 
 BEGIN {
-    push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bXS\/APItest\b/) {
 	# Look, I'm using this fully-qualified variable more than once!
-	my $arch = $MacPerl::Architecture;
         print "1..0 # Skip: XS::APItest was not built\n";
         exit 0;
     }
diff --git a/ext/XS-APItest/t/exception.t b/ext/XS-APItest/t/exception.t
index 20d5d163c4..bc2142d990 100644
--- a/ext/XS-APItest/t/exception.t
+++ b/ext/XS-APItest/t/exception.t
@@ -1,5 +1,4 @@
 BEGIN {
-    push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bXS\/APItest\b/) {
         print "1..0 # Skip: XS::APItest was not built\n";
diff --git a/ext/XS-APItest/t/hash.t b/ext/XS-APItest/t/hash.t
index e710bc2542..6c822ee34a 100644
--- a/ext/XS-APItest/t/hash.t
+++ b/ext/XS-APItest/t/hash.t
@@ -1,11 +1,9 @@
 #!perl -w
 
 BEGIN {
-  push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
   require Config; import Config;
   if ($Config{'extensions'} !~ /\bXS\/APItest\b/) {
     # Look, I'm using this fully-qualified variable more than once!
-    my $arch = $MacPerl::Architecture;
     print "1..0 # Skip: XS::APItest was not built\n";
     exit 0;
   }
diff --git a/ext/XS-APItest/t/my_cxt.t b/ext/XS-APItest/t/my_cxt.t
index 2513518eef..f2e8722a3b 100644
--- a/ext/XS-APItest/t/my_cxt.t
+++ b/ext/XS-APItest/t/my_cxt.t
@@ -5,11 +5,9 @@
 
 my $threads;
 BEGIN {
-    push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bXS\/APItest\b/) {
 	# Look, I'm using this fully-qualified variable more than once!
-	my $arch = $MacPerl::Architecture;
         print "1..0 # Skip: XS::APItest was not built\n";
         exit 0;
     }
diff --git a/ext/XS-APItest/t/op.t b/ext/XS-APItest/t/op.t
index 1c3d970363..f1c7cca19e 100644
--- a/ext/XS-APItest/t/op.t
+++ b/ext/XS-APItest/t/op.t
@@ -1,11 +1,9 @@
 #!perl -w
 
 BEGIN {
-  push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
   require Config; import Config;
   if ($Config{'extensions'} !~ /\bXS\/APItest\b/) {
     # Look, I'm using this fully-qualified variable more than once!
-    my $arch = $MacPerl::Architecture;
     print "1..0 # Skip: XS::APItest was not built\n";
     exit 0;
   }
diff --git a/ext/XS-APItest/t/printf.t b/ext/XS-APItest/t/printf.t
index 23741890d5..aca63353cd 100644
--- a/ext/XS-APItest/t/printf.t
+++ b/ext/XS-APItest/t/printf.t
@@ -1,5 +1,4 @@
 BEGIN {
-    push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bXS\/APItest\b/) {
         print "1..0 # Skip: XS::APItest was not built\n";
diff --git a/ext/XS-APItest/t/push.t b/ext/XS-APItest/t/push.t
index b50c429fe9..c1606387db 100644
--- a/ext/XS-APItest/t/push.t
+++ b/ext/XS-APItest/t/push.t
@@ -1,5 +1,4 @@
 BEGIN {
-    push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bXS\/APItest\b/) {
         print "1..0 # Skip: XS::APItest was not built\n";
diff --git a/ext/XS-APItest/t/svpeek.t b/ext/XS-APItest/t/svpeek.t
index 824c0c8d78..c5f8cb56ca 100644
--- a/ext/XS-APItest/t/svpeek.t
+++ b/ext/XS-APItest/t/svpeek.t
@@ -1,5 +1,4 @@
 BEGIN {
-    push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bXS\/APItest\b/) {
         print "1..0 # Skip: XS::APItest was not built\n";
diff --git a/ext/XS-APItest/t/svsetsv.t b/ext/XS-APItest/t/svsetsv.t
index bde39e56ea..ae4e3a6bbc 100644
--- a/ext/XS-APItest/t/svsetsv.t
+++ b/ext/XS-APItest/t/svsetsv.t
@@ -1,5 +1,4 @@
 BEGIN {
-    push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bXS\/APItest\b/) {
         print "1..0 # Skip: XS::APItest was not built\n";
diff --git a/ext/XS-APItest/t/temp_lv_sub.t b/ext/XS-APItest/t/temp_lv_sub.t
index d0c51fde75..6a114520d0 100644
--- a/ext/XS-APItest/t/temp_lv_sub.t
+++ b/ext/XS-APItest/t/temp_lv_sub.t
@@ -1,11 +1,9 @@
 #!perl -w
 
 BEGIN {
-  push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
   require Config; import Config;
   if ($Config{'extensions'} !~ /\bXS\/APItest\b/) {
     # Look, I'm using this fully-qualified variable more than once!
-    my $arch = $MacPerl::Architecture;
     print "1..0 # Skip: XS::APItest was not built\n";
     exit 0;
   }
diff --git a/ext/XS-APItest/t/xs_special_subs.t b/ext/XS-APItest/t/xs_special_subs.t
index 90f54dccc6..e058a223dd 100644
--- a/ext/XS-APItest/t/xs_special_subs.t
+++ b/ext/XS-APItest/t/xs_special_subs.t
@@ -1,14 +1,13 @@
 #!perl -w
 
 BEGIN {
-    push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bXS\/APItest\b/) {
         print "1..0 # Skip: XS::APItest was not built\n";
         exit 0;
     }
     # Hush the used only once warning.
-    $XS::APItest::WARNINGS_ON_BOOTSTRAP = $MacPerl::Architecture;
+    no warnings 'once';
     $XS::APItest::WARNINGS_ON_BOOTSTRAP = 1;
 }
 
diff --git a/ext/XS-APItest/t/xs_special_subs_require.t b/ext/XS-APItest/t/xs_special_subs_require.t
index 55b69481b3..c9890ff932 100644
--- a/ext/XS-APItest/t/xs_special_subs_require.t
+++ b/ext/XS-APItest/t/xs_special_subs_require.t
@@ -1,13 +1,12 @@
 #!perl -w
 BEGIN {
-    push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bXS\/APItest\b/) {
         print "1..0 # Skip: XS::APItest was not built\n";
         exit 0;
     }
     # Hush the used only once warning.
-    $XS::APItest::WARNINGS_ON_BOOTSTRAP = $MacPerl::Architecture;
+    no warnings 'once';
     $XS::APItest::WARNINGS_ON_BOOTSTRAP = 1;
 }