In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/216e7dec1076aa94d5b8331c187c135e4952955a?hp=46d6503777f357c38f9d1cde19b6d3d1c6f36d3d>
- Log ----------------------------------------------------------------- commit 216e7dec1076aa94d5b8331c187c135e4952955a Author: Rafael Garcia-Suarez <[email protected]> Date: Tue May 5 09:18:29 2009 +0200 Bump version of File::Copy M lib/File/Copy.pm commit 079cb8cc5abf40c0b016f9f878493b4d192d85d3 Author: Paul Fenwick <[email protected]> Date: Fri Apr 24 23:14:01 2009 +0930 Make File::Copy always return 0 (not "") on failure. On Unix systems, the subroutines in File::Copy always return 0 on failure. On Windows, move() and mv() return 0, but copy() and cp() return "". This commit makes File::Copy consistently return 0 on failure. M lib/File/Copy.pm M lib/File/Copy.t ----------------------------------------------------------------------- Summary of changes: lib/File/Copy.pm | 4 ++-- lib/File/Copy.t | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/lib/File/Copy.pm b/lib/File/Copy.pm index 7393bf4..cfa74ba 100644 --- a/lib/File/Copy.pm +++ b/lib/File/Copy.pm @@ -22,7 +22,7 @@ sub syscopy; sub cp; sub mv; -$VERSION = '2.15'; +$VERSION = '2.16'; require Exporter; @ISA = qw(Exporter); @@ -213,7 +213,7 @@ sub copy { } } - return syscopy($from, $copy_to); + return syscopy($from, $copy_to) || 0; } my $closefrom = 0; diff --git a/lib/File/Copy.t b/lib/File/Copy.t index 45bc612..cf5b2d9 100755 --- a/lib/File/Copy.t +++ b/lib/File/Copy.t @@ -14,7 +14,7 @@ use Test::More; my $TB = Test::More->builder; -plan tests => 451; +plan tests => 459; # We're going to override rename() later on but Perl has to see an override # at compile time to honor it. @@ -396,6 +396,43 @@ SKIP: { } } +# On Unix systems, File::Copy always returns 0 to signal failure, +# even when in list context! On Windows, it always returns "" to signal +# failure. +# +# While returning a list containing a false value is arguably a bad +# API design, at the very least we can make sure it always returns +# the same false value. + +my $NO_SUCH_FILE = "this_file_had_better_not_exist"; +my $NO_SUCH_OTHER_FILE = "my_goodness_im_sick_of_airports"; + +use constant EXPECTED_SCALAR => 0; +use constant EXPECTED_LIST => [ EXPECTED_SCALAR ]; + +my %subs = ( + copy => \&File::Copy::copy, + cp => \&File::Copy::cp, + move => \&File::Copy::move, + mv => \&File::Copy::mv, +); + +SKIP: { + skip( "Test can't run with $NO_SUCH_FILE existing", 2 * keys %subs) + if (-e $NO_SUCH_FILE); + + foreach my $name (keys %subs) { + + my $sub = $subs{$name}; + + my $scalar = $sub->( $NO_SUCH_FILE, $NO_SUCH_OTHER_FILE ); + is( $scalar, EXPECTED_SCALAR, "$name in scalar context"); + + my @array = $sub->( $NO_SUCH_FILE, $NO_SUCH_OTHER_FILE ); + is_deeply( \...@array, EXPECTED_LIST, "$name in list context"); + } +} + END { 1 while unlink "file-$$"; 1 while unlink "lib/file-$$"; -- Perl5 Master Repository
