In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/8ced8222abf2622ec6f811948d37fbd29984c1fc?hp=dd2d1456ae6cdb1b6f476dd4923e18c36a45b6ea>
- Log -----------------------------------------------------------------
commit 8ced8222abf2622ec6f811948d37fbd29984c1fc
Author: Nicholas Clark <n...@ccl4.org>
Date: Tue Jan 18 16:14:43 2011 +0000
Remove Mac OS classic code from scripts in utils/
M utils/perlbug.PL
M utils/perlivp.PL
commit 70360898be6df93e2fb37993d9490258336b4823
Author: Nicholas Clark <n...@ccl4.org>
Date: Tue Jan 18 15:52:10 2011 +0000
Remove Mac OS classic code from tests in lib.
Including all @INC setting boilerplate from lib/Tie/ExtraHash.t, which
TestInit
now performs.
M lib/AnyDBM_File.t
M lib/Net/hostent.t
M lib/Pod/t/Usage.t
M lib/Tie/ExtraHash.t
M lib/Unicode/UCD.t
-----------------------------------------------------------------------
Summary of changes:
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 -
utils/perlbug.PL | 41 +++++++++++------------------------------
utils/perlivp.PL | 4 ----
7 files changed, 14 insertions(+), 48 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 2cabb55..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";
diff --git a/utils/perlbug.PL b/utils/perlbug.PL
index 955e98f..2972ae7 100644
--- a/utils/perlbug.PL
+++ b/utils/perlbug.PL
@@ -168,7 +168,7 @@ my $Version = "1.39";
my( $file, $usefile, $cc, $address, $bugaddress, $testaddress, $thanksaddress,
$filename, $messageid, $domain, $subject, $from, $verbose, $ed, $outfile,
$fh, $me, $body, $andcc, %REP, $ok, $thanks, $progname,
- $Is_MacOS, $Is_MSWin32, $Is_Linux, $Is_VMS, $Is_OpenBSD,
+ $Is_MSWin32, $Is_Linux, $Is_VMS, $Is_OpenBSD,
$report_about_module, $category, $severity,
);
@@ -254,11 +254,6 @@ sub Init {
$Is_VMS = $^O eq 'VMS';
$Is_Linux = lc($^O) eq 'linux';
$Is_OpenBSD = lc($^O) eq 'openbsd';
- $Is_MacOS = $^O eq 'MacOS';
-
- @ARGV = split m/\s+/,
- MacPerl::Ask('Provide command line args here (-h for help):')
- if $Is_MacOS && $MacPerl::Version =~ /App/;
if (!getopts("Adhva:s:b:f:F:r:e:SCc:to:n:T")) { Help(); exit; };
@@ -316,7 +311,6 @@ sub Init {
$ed = $::opt_e || $ENV{VISUAL} || $ENV{EDITOR} || $ENV{EDIT}
|| ($Is_VMS && "edit/tpu")
|| ($Is_MSWin32 && "notepad")
- || ($Is_MacOS && '')
|| "vi";
# Not OK - provide build failure template by finessing OK report
@@ -388,7 +382,6 @@ EOF
# My username
$me = $Is_MSWin32 ? $ENV{'USERNAME'}
: $^O eq 'os2' ? $ENV{'USER'} || $ENV{'LOGNAME'}
- : $Is_MacOS ? $ENV{'USER'}
: eval { getpwuid($<) }; # May be missing
$from = $::Config{'cf_email'}
@@ -462,12 +455,6 @@ EOF
$guess = $ENV{'REPLY-TO'} || $ENV{'REPLYTO'} || $ENV{'EMAIL'}
|| $from || '';
- if ($Is_MacOS) {
- require Mac::InternetConfig;
- $guess = $Mac::InternetConfig::InternetConfig{
- Mac::InternetConfig::kICEmail()
- };
- }
unless ($guess) {
# move $domain to where we can use it elsewhere
@@ -813,29 +800,23 @@ sub _edit_file {
my $report_written = 0;
while ( !$report_written ) {
- if ($Is_MacOS) {
- require ExtUtils::MakeMaker;
- ExtUtils::MM_MacOS::launch_file($filename);
- _prompt('', "Press Enter when done." );
- } else { # we're not on oldschool mac os
- my $exit_status = system("$editor $filename");
- if ($exit_status) {
- my $desc = <<EOF;
+ my $exit_status = system("$editor $filename");
+ if ($exit_status) {
+ my $desc = <<EOF;
The editor you chose ('$editor') could not be run!
If you mistyped its name, please enter it now, otherwise just press Enter.
EOF
- my $entry = _prompt( $desc, 'Editor', $editor );
- if ( $entry ne "" ) {
- $editor = $entry;
- next;
- } else {
- paraprint <<EOF;
+ my $entry = _prompt( $desc, 'Editor', $editor );
+ if ( $entry ne "" ) {
+ $editor = $entry;
+ next;
+ } else {
+ paraprint <<EOF;
You may want to save your report to a file, so you can edit and
mail it later.
EOF
- return;
- }
+ return;
}
}
return if ( $ok and not $::opt_n ) || $body;
diff --git a/utils/perlivp.PL b/utils/perlivp.PL
index ceefc3d..6fcb670 100644
--- a/utils/perlivp.PL
+++ b/utils/perlivp.PL
@@ -142,10 +142,6 @@ my $INC_total = 0;
my $INC_there = 0;
foreach (@INC) {
next if $_ eq '.'; # skip -d test here
- if ($^O eq 'MacOS') {
- next if $_ eq ':'; # skip -d test here
- next if $_ eq 'Dev:Pseudo:'; # why is this in @INC?
- }
if (-d $_) {
print "## Perl \@INC directory `$_' exists.\n" if $opt{'v'};
$INC_there++;
--
Perl5 Master Repository
