Change 33351 by [EMAIL PROTECTED] on 2008/02/22 18:34:25
Integrate:
[ 32353]
Silence ill-behaved Test::Harness test on VMS.
[ 33348]
Integrate:
[ 33274]
Make fs.t compare the permissions of a link with those
of the linked file rather than guessing at system defaults.
Affected files ...
... //depot/maint-5.8/perl/lib/Test/Harness/t/failure.t#2 integrate
... //depot/maint-5.8/perl/t/io/fs.t#11 integrate
Differences ...
==== //depot/maint-5.8/perl/lib/Test/Harness/t/failure.t#2 (text) ====
Index: perl/lib/Test/Harness/t/failure.t
--- perl/lib/Test/Harness/t/failure.t#1~30055~ 2007-01-28 15:54:52.000000000
-0800
+++ perl/lib/Test/Harness/t/failure.t 2008-02-22 10:34:25.000000000 -0800
@@ -1,6 +1,13 @@
#!/usr/bin/perl -w
BEGIN {
+ if ($^O eq 'VMS') {
+ print '1..0 # Child test output confuses parent test counter';
+ exit;
+ }
+}
+
+BEGIN {
if ( $ENV{PERL_CORE} ) {
chdir 't';
@INC = ('../lib', 'lib');
==== //depot/maint-5.8/perl/t/io/fs.t#11 (xtext) ====
Index: perl/t/io/fs.t
--- perl/t/io/fs.t#10~32379~ 2007-11-17 12:42:55.000000000 -0800
+++ perl/t/io/fs.t 2008-02-22 10:34:25.000000000 -0800
@@ -86,7 +86,7 @@
close(FH);
my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
- $blksize,$blocks);
+ $blksize,$blocks,$a_mode);
SKIP: {
skip("no link", 4) unless $has_link;
@@ -94,6 +94,8 @@
ok(link('a','b'), "link a b");
ok(link('b','c'), "link b c");
+ $a_mode = (stat('a'))[2];
+
($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
$blksize,$blocks) = stat('c');
@@ -110,7 +112,9 @@
# if ($^O eq 'cygwin') { # new files on cygwin get rwx instead of rw-
# is($mode & 0777, 0777, "mode of triply-linked file");
# } else {
- is($mode & 0777, 0666, "mode of triply-linked file");
+ is(sprintf("0%o", $mode & 0777),
+ sprintf("0%o", $a_mode & 0777),
+ "mode of triply-linked file");
# }
}
}
End of Patch.
