In perl.git, the branch rjbs/cant-run-dir-locale has been updated <http://perl5.git.perl.org/perl.git/commitdiff/598f6130824f3edb78ceea5b5cf258f80987cb98?hp=2fde845cf78166ec653866936e509d37d09fb0c2>
- Log ----------------------------------------------------------------- commit 598f6130824f3edb78ceea5b5cf258f80987cb98 Author: Ricardo Signes <[email protected]> Date: Wed Jan 16 08:56:57 2013 -0500 in testing EISDIR stderr from perl, check known value first ----------------------------------------------------------------------- Summary of changes: Configure | 2 +- Cross/Makefile-cross-SH | 2 +- MANIFEST | 1 - Makefile.SH | 2 +- Porting/Maintainers.pl | 4 +- cpan/Test-Harness/Changes | 6 +- cpan/Test-Harness/MANIFEST | 2 +- cpan/Test-Harness/t/compat/env_opts.t | 7 +- dist/Cwd/Cwd.pm | 2 +- dist/Cwd/lib/File/Spec.pm | 4 +- dist/Cwd/lib/File/Spec/Cygwin.pm | 2 +- dist/Cwd/lib/File/Spec/Epoc.pm | 2 +- dist/Cwd/lib/File/Spec/Functions.pm | 2 +- dist/Cwd/lib/File/Spec/Mac.pm | 2 +- dist/Cwd/lib/File/Spec/OS2.pm | 2 +- dist/Cwd/lib/File/Spec/Unix.pm | 2 +- dist/Cwd/lib/File/Spec/VMS.pm | 2 +- dist/Cwd/lib/File/Spec/Win32.pm | 2 +- hints/rhapsody.sh | 138 --------------------------------- installperl | 4 +- pod/perldelta.pod | 6 +- pod/perlfunc.pod | 2 +- t/op/stat.t | 3 +- t/run/switches.t | 11 ++- 24 files changed, 36 insertions(+), 176 deletions(-) delete mode 100644 hints/rhapsody.sh diff --git a/Configure b/Configure index 06e216f..a3bd51c 100755 --- a/Configure +++ b/Configure @@ -18708,7 +18708,7 @@ eval $setvar : Check if is a multiplatform env case "$osname" in -next|rhapsody|darwin) multiarch="$define" ;; +next|darwin) multiarch="$define" ;; esac case "$multiarch" in ''|[nN]*) multiarch="$undef" ;; diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH index 65d7801..6307742 100644 --- a/Cross/Makefile-cross-SH +++ b/Cross/Makefile-cross-SH @@ -53,7 +53,7 @@ true) -compatibility_version 1 -current_version $patchlevel \ -prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@" ;; - rhapsody*|darwin*) + darwin*) shrpldflags="${ldflags} -dynamiclib \ -compatibility_version \ ${api_revision}.${api_version}.${api_subversion} \ diff --git a/MANIFEST b/MANIFEST index 5791283..31000e4 100644 --- a/MANIFEST +++ b/MANIFEST @@ -4179,7 +4179,6 @@ hints/posix-bc.sh Hints for named architecture hints/powerux.sh Hints for named architecture hints/qnx.sh Hints for named architecture hints/README.hints Notes about hints -hints/rhapsody.sh Hints for named architecture hints/riscos.sh Hints for named architecture hints/sco_2_3_0.sh Hints for named architecture hints/sco_2_3_1.sh Hints for named architecture diff --git a/Makefile.SH b/Makefile.SH index 33de34d..19eaeb1 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -61,7 +61,7 @@ true) -compatibility_version 1 -current_version $patchlevel \ -prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@" ;; - rhapsody*|darwin*) + darwin*) shrpldflags="${ldflags} -dynamiclib \ -compatibility_version \ ${api_revision}.${api_version}.${api_subversion} \ diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index bca6395..2d0f8fa 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1390,7 +1390,7 @@ use File::Glob qw(:case); 'PathTools' => { 'MAINTAINER' => 'kwilliams', - 'DISTRIBUTION' => 'SMUELLER/PathTools-3.33.tar.gz', + 'DISTRIBUTION' => 'SMUELLER/PathTools-3.40.tar.gz', 'FILES' => q[dist/Cwd], 'EXCLUDED' => [qr{^t/lib/Test/}], 'UPSTREAM' => "blead", @@ -1734,7 +1734,7 @@ use File::Glob qw(:case); 'Test::Harness' => { 'MAINTAINER' => 'andya', - 'DISTRIBUTION' => 'OVID/Test-Harness-3.25.tar.gz', + 'DISTRIBUTION' => 'OVID/Test-Harness-3.26.tar.gz', 'FILES' => q[cpan/Test-Harness], 'EXCLUDED' => [ qr{^examples/}, diff --git a/cpan/Test-Harness/Changes b/cpan/Test-Harness/Changes index 98629aa..88039e5 100644 --- a/cpan/Test-Harness/Changes +++ b/cpan/Test-Harness/Changes @@ -1,6 +1,10 @@ Revision history for Test-Harness -3.25 2012-06-05 +3.26 2013-01-16 + - Renamed env.opts.t to env_opts.t (for VMS) + - Skipped some TAP::Formatter::HTML tests due to this bug: #82738 + +3.26 2012-06-05 - Rereleased to fix CPAN permission problem. No functional change. 3.24 2012-06-03 diff --git a/cpan/Test-Harness/MANIFEST b/cpan/Test-Harness/MANIFEST index 63b696b..93e9ac8 100644 --- a/cpan/Test-Harness/MANIFEST +++ b/cpan/Test-Harness/MANIFEST @@ -76,7 +76,7 @@ t/aggregator.t t/bailout.t t/base.t t/callbacks.t -t/compat/env.opts.t +t/compat/env_opts.t t/compat/env.t t/compat/failure.t t/compat/inc-propagation.t diff --git a/cpan/Test-Harness/t/compat/env_opts.t b/cpan/Test-Harness/t/compat/env_opts.t index c28f4c2..62770db 100644 --- a/cpan/Test-Harness/t/compat/env_opts.t +++ b/cpan/Test-Harness/t/compat/env_opts.t @@ -1,11 +1,7 @@ #!/usr/bin/perl -w use strict; -use Test::More ( - $^O eq 'VMS' - ? ( skip_all => 'VMS' ) - : ( tests => 12 ) -); +use Test::More tests => 12; use Test::Harness; @@ -25,6 +21,7 @@ sub _has_module { is( $harness->jobs, 4, "set jobs correctly" ); } SKIP: { + skip 'Can\'t locate object method "color" via package "TAP::Formatter::HTML" (RT 82738)',4; skip "requires TAP::Formatter::HTML", 4 unless _has_module('TAP::Formatter::HTML'); diff --git a/dist/Cwd/Cwd.pm b/dist/Cwd/Cwd.pm index 888c505..8886c67 100644 --- a/dist/Cwd/Cwd.pm +++ b/dist/Cwd/Cwd.pm @@ -171,7 +171,7 @@ use strict; use Exporter; use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION); -$VERSION = '3.39_03'; +$VERSION = '3.40'; my $xs_version = $VERSION; $VERSION =~ tr/_//; diff --git a/dist/Cwd/lib/File/Spec.pm b/dist/Cwd/lib/File/Spec.pm index 782e284..6062c01 100644 --- a/dist/Cwd/lib/File/Spec.pm +++ b/dist/Cwd/lib/File/Spec.pm @@ -3,7 +3,7 @@ package File::Spec; use strict; use vars qw(@ISA $VERSION); -$VERSION = '3.39_02'; +$VERSION = '3.40'; $VERSION =~ tr/_//; my %module = (MacOS => 'Mac', @@ -331,7 +331,7 @@ splitpath(), splitdir(), catpath() and catdir() by Barrie Slaymaker. =head1 COPYRIGHT -Copyright (c) 2004-2010 by the Perl 5 Porters. All rights reserved. +Copyright (c) 2004-2013 by the Perl 5 Porters. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/dist/Cwd/lib/File/Spec/Cygwin.pm b/dist/Cwd/lib/File/Spec/Cygwin.pm index b63b85f..b27f7b1 100644 --- a/dist/Cwd/lib/File/Spec/Cygwin.pm +++ b/dist/Cwd/lib/File/Spec/Cygwin.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.39_02'; +$VERSION = '3.40'; $VERSION =~ tr/_//; @ISA = qw(File::Spec::Unix); diff --git a/dist/Cwd/lib/File/Spec/Epoc.pm b/dist/Cwd/lib/File/Spec/Epoc.pm index 50304ff..e7faa16 100644 --- a/dist/Cwd/lib/File/Spec/Epoc.pm +++ b/dist/Cwd/lib/File/Spec/Epoc.pm @@ -3,7 +3,7 @@ package File::Spec::Epoc; use strict; use vars qw($VERSION @ISA); -$VERSION = '3.39_02'; +$VERSION = '3.40'; $VERSION =~ tr/_//; require File::Spec::Unix; diff --git a/dist/Cwd/lib/File/Spec/Functions.pm b/dist/Cwd/lib/File/Spec/Functions.pm index 454a5b3..f5b9046 100644 --- a/dist/Cwd/lib/File/Spec/Functions.pm +++ b/dist/Cwd/lib/File/Spec/Functions.pm @@ -5,7 +5,7 @@ use strict; use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION); -$VERSION = '3.39_02'; +$VERSION = '3.40'; $VERSION =~ tr/_//; require Exporter; diff --git a/dist/Cwd/lib/File/Spec/Mac.pm b/dist/Cwd/lib/File/Spec/Mac.pm index 57d1d3e..7f42171 100644 --- a/dist/Cwd/lib/File/Spec/Mac.pm +++ b/dist/Cwd/lib/File/Spec/Mac.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.39_02'; +$VERSION = '3.40'; $VERSION =~ tr/_//; @ISA = qw(File::Spec::Unix); diff --git a/dist/Cwd/lib/File/Spec/OS2.pm b/dist/Cwd/lib/File/Spec/OS2.pm index 5461cf7..7f60d68 100644 --- a/dist/Cwd/lib/File/Spec/OS2.pm +++ b/dist/Cwd/lib/File/Spec/OS2.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.39_02'; +$VERSION = '3.40'; $VERSION =~ tr/_//; @ISA = qw(File::Spec::Unix); diff --git a/dist/Cwd/lib/File/Spec/Unix.pm b/dist/Cwd/lib/File/Spec/Unix.pm index ac63217..a1a91b4 100644 --- a/dist/Cwd/lib/File/Spec/Unix.pm +++ b/dist/Cwd/lib/File/Spec/Unix.pm @@ -3,7 +3,7 @@ package File::Spec::Unix; use strict; use vars qw($VERSION); -$VERSION = '3.39_03'; +$VERSION = '3.40'; $VERSION =~ tr/_//; =head1 NAME diff --git a/dist/Cwd/lib/File/Spec/VMS.pm b/dist/Cwd/lib/File/Spec/VMS.pm index 1ababbf..6af1ac0 100644 --- a/dist/Cwd/lib/File/Spec/VMS.pm +++ b/dist/Cwd/lib/File/Spec/VMS.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.39_02'; +$VERSION = '3.40'; $VERSION =~ tr/_//; @ISA = qw(File::Spec::Unix); diff --git a/dist/Cwd/lib/File/Spec/Win32.pm b/dist/Cwd/lib/File/Spec/Win32.pm index 39f5a8b..ae74a26 100644 --- a/dist/Cwd/lib/File/Spec/Win32.pm +++ b/dist/Cwd/lib/File/Spec/Win32.pm @@ -5,7 +5,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.39_02'; +$VERSION = '3.40'; $VERSION =~ tr/_//; @ISA = qw(File::Spec::Unix); diff --git a/hints/rhapsody.sh b/hints/rhapsody.sh deleted file mode 100644 index 6151e78..0000000 --- a/hints/rhapsody.sh +++ /dev/null @@ -1,138 +0,0 @@ -## -# Rhapsody (Mac OS X Server) hints -# Wilfredo Sanchez <[email protected]> -## - -## -# Paths -## - -# Configure hasn't figured out the version number yet. Bummer. -perl_revision=`awk '/define[ ]+PERL_REVISION/ {print $3}' $src/patchlevel.h` -perl_version=`awk '/define[ ]+PERL_VERSION/ {print $3}' $src/patchlevel.h` -perl_subversion=`awk '/define[ ]+PERL_SUBVERSION/ {print $3}' $src/patchlevel.h` -version="${perl_revision}.${perl_version}.${perl_subversion}" - -# BSD paths -case "$prefix" in - '') - # Default install; use non-system directories - prefix='/usr/local'; # Built-in perl uses /usr - siteprefix='/usr/local'; - vendorprefix='/usr'; usevendorprefix='define'; - - # Where to put modules. - sitelib="/Local/Library/Perl/${version}"; # FIXME: Want "/Network/Perl/${version}" also - vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules - ;; - - '/usr') - # We are building/replacing the built-in perl - siteprefix='/usr/local'; - vendorprefix='/usr/local'; usevendorprefix='define'; - - # Where to put modules. - sitelib="/Local/Library/Perl/${version}"; # FIXME: Want "/Network/Perl/${version}" also - vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules - ;; -esac - -## -# Tool chain settings -## - -# Since we can build fat, the archname doesn't need the processor type -archname='rhapsody'; - -# nm works. -usenm='true'; - -# Libc is in libsystem. -libc='/System/Library/Frameworks/System.framework/System'; - -# Optimize. -optimize='-O3'; - -# -fno-common because common symbols are not allowed in MH_DYLIB -ccflags="${ccflags} -fno-common" - -# Unverified whether this is necessary on Rhapsody, but the test shouldn't hurt. -# At least on Darwin 1.3.x: -# -# # define INT32_MIN -2147483648 -# int main () { -# double a = INT32_MIN; -# printf ("INT32_MIN=%g\n", a); -# return 0; -# } -# will output: -# INT32_MIN=2.14748e+09 -# Note that the INT32_MIN has become positive. -# INT32_MIN is set in /usr/include/stdint.h by: -# #define INT32_MIN -2147483648 -# which seems to break the gcc. Defining INT32_MIN as (-2147483647-1) -# seems to work. INT64_MIN seems to be similarly broken. -# -- Nicholas Clark, Ken Williams, and Edward Moy -# -case "$(grep '^#define INT32_MIN' /usr/include/stdint.h)" in - *-2147483648) ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN" ;; -esac - -# cpp-precomp is problematic. -cppflags='${cppflags} -traditional-cpp'; - -# This is necessary because perl's build system doesn't -# apply cppflags to cc compile lines as it should. -ccflags="${ccflags} ${cppflags}" - -# Shared library extension is .dylib. -# Bundle extension is .bundle. -ld='cc'; -so='dylib'; -dlext='bundle'; -dlsrc='dl_dyld.xs'; -usedl='define'; -cccdlflags=''; -lddlflags="${ldflags} -bundle -undefined suppress"; -ldlibpthname='DYLD_LIBRARY_PATH'; -useshrplib='true'; - -## -# System libraries -## - -# vfork works -usevfork='true'; - -# our malloc works (but allow users to override) -case "$usemymalloc" in -'') usemymalloc='n' ;; -esac - -# -# The libraries are not threadsafe in Rhapsody -# -# Fix when Apple fixes libc. -# -case "$usethreads$useithreads" in - *define*) - cat <<EOM >&4 - - - -*** Warning, there might be problems with your libraries with -*** regards to threading. The test ext/threads/t/libc.t is likely -*** to fail. - -EOM - ;; -esac - -## -# Build process -## - -# Case-insensitive filesystems don't get along with Makefile and -# makefile in the same place. Since Darwin uses GNU make, this dodges -# the problem. -firstmakefile=GNUmakefile; diff --git a/installperl b/installperl index 64a94ab..e64b1c3 100755 --- a/installperl +++ b/installperl @@ -385,7 +385,7 @@ foreach my $file (@corefiles) { # on dynamically-loadable libraries. So we do it for all. if (copy_if_diff($file,"$installarchlib/CORE/$file")) { if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) { - strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody|darwin)$/; + strip("-S", "$installarchlib/CORE/$file") if $^O eq 'darwin'; chmod(0555, "$installarchlib/CORE/$file"); } else { chmod(0444, "$installarchlib/CORE/$file"); @@ -777,7 +777,7 @@ sub installlib { # on dynamically-loaded libraries. if (copy_if_diff($_, "$installlib/$name")) { strip("-S", "$installlib/$name") - if $^O =~ /^(rhapsody|darwin)$/ and /\.(?:so|$dlext|a)$/; + if $^O eq 'darwin' and /\.(?:so|$dlext|a)$/; chmod(/\.(so|$dlext)$/ ? 0555 : 0444, "$installlib/$name"); } } diff --git a/pod/perldelta.pod b/pod/perldelta.pod index a43cf72..e9f0e12 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -309,13 +309,11 @@ XXX =head2 Discontinued Platforms -XXX List any platforms that this version of perl no longer compiles on. - =over 4 -=item XXX-some-platform +=item Rhapsody -XXX +Support for Rhapsody has been removed. =back diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod index f39974e..9d35adf 100644 --- a/pod/perlfunc.pod +++ b/pod/perlfunc.pod @@ -3361,7 +3361,7 @@ X<length> X<size> =item length -=for Pod::Functions return the number of bytes in a string +=for Pod::Functions return the number of characters in a string Returns the length in I<characters> of the value of EXPR. If EXPR is omitted, returns the length of C<$_>. If EXPR is undefined, returns diff --git a/t/op/stat.t b/t/op/stat.t index c49aaf4..c5c74ca 100644 --- a/t/op/stat.t +++ b/t/op/stat.t @@ -38,7 +38,6 @@ $Is_Solaris = $^O eq 'solaris'; $Is_VMS = $^O eq 'VMS'; $Is_DGUX = $^O eq 'dgux'; $Is_MPRAS = $^O =~ /svr4/ && -f '/etc/.relid'; -$Is_Rhapsody= $^O eq 'rhapsody'; $Is_Dosish = $Is_Dos || $Is_OS2 || $Is_MSWin32 || $Is_NetWare; @@ -344,7 +343,7 @@ SKIP: { SKIP: { skip "These tests require a TTY", 4 if $ENV{PERL_SKIP_TTY_TEST}; - my $TTY = $Is_Rhapsody ? "/dev/ttyp0" : "/dev/tty"; + my $TTY = "/dev/tty"; SKIP: { skip "Test uses unixisms", 2 if $Is_MSWin32 || $Is_NetWare; diff --git a/t/run/switches.t b/t/run/switches.t index c119bee..ea94571 100644 --- a/t/run/switches.t +++ b/t/run/switches.t @@ -14,6 +14,7 @@ BEGIN { require "./test.pl"; } plan(tests => 115); use Config; +use Errno qw(EISDIR); # due to a bug in VMS's piping which makes it impossible for runperl() # to emulate echo -n (ie. stdin always winds up with a newline), these @@ -111,16 +112,16 @@ SWTEST my $tempdir = tempfile; mkdir $tempdir, 0700 or die "Can't mkdir '$tempdir': $!"; + local $ENV{'LC_ALL'} = 'C'; # Keep the test simple: expect English + local $ENV{LANGUAGE} = 'C'; + # Win32 won't let us open the directory, so we never get to die with # EISDIR, which happens after open. + my $eisdir = do { local $! = EISDIR; "$!" }; my $error = $^O eq 'MSWin32' ? 'Permission denied' : 'Is a directory'; - - $ENV{'LC_ALL'} = 'C'; # Keep the test simple: expect English - $ENV{LANGUAGE} = 'C'; - like( runperl( switches => [ '-c' ], args => [ $tempdir ], stderr => 1), - qr/Can't open perl script.*$tempdir.*$error/s, + qr/Can't open perl script.*$tempdir.*\Q$error/s, "RT \#61362: Cannot syntax-check a directory" ); rmdir $tempdir or die "Can't rmdir '$tempdir': $!"; -- Perl5 Master Repository
