X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fio%2Ffs.t;h=eb305a93e8a5794f42994f8e952b0385eadd0136;hb=2d862febb32638bf1f7663134644cf7e37f284ad;hp=9feed5f1db059ba80a3ada769d1a966843c5c621;hpb=2585f9a36cbb1a792eb49405e800bf4d68a3291b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/io/fs.t b/t/io/fs.t
index 9feed5f..eb305a9 100755
--- a/t/io/fs.t
+++ b/t/io/fs.t
@@ -7,7 +7,9 @@ BEGIN {
 }
 
 use Config;
+use File::Spec::Functions;
 
+my $Is_MacOS  = ($^O eq 'MacOS');
 my $Is_VMSish = ($^O eq 'VMS');
 
 if (($^O eq 'MSWin32') || ($^O eq 'NetWare')) {
@@ -24,7 +26,8 @@ my $accurate_timestamps =
     !($^O eq 'MSWin32' || $^O eq 'NetWare' ||
       $^O eq 'dos'     || $^O eq 'os2'     ||
       $^O eq 'mint'    || $^O eq 'cygwin'  ||
-      $^O eq 'amigaos' || $wd =~ m#$Config{afsroot}/#
+      $^O eq 'amigaos' || $wd =~ m#$Config{afsroot}/# ||
+      $Is_MacOS
      );
 
 if (defined &Win32::IsWinNT && Win32::IsWinNT()) {
@@ -44,29 +47,33 @@ $needs_fh_reopen = 1 if (defined &Win32::IsWin95 && Win32::IsWin95());
 my $skip_mode_checks =
     $^O eq 'cygwin' && $ENV{CYGWIN} !~ /ntsec/;
 
-plan tests => 36;
+plan tests => 34;
 
 
 if (($^O eq 'MSWin32') || ($^O eq 'NetWare')) {
     `rmdir /s /q tmp 2>nul`;
     `mkdir tmp`;
-} elsif ($^O eq 'VMS') {
+}
+elsif ($^O eq 'VMS') {
     `if f\$search("[.tmp]*.*") .nes. "" then delete/nolog/noconfirm [.tmp]*.*.*`;
     `if f\$search("tmp.dir") .nes. "" then delete/nolog/noconfirm tmp.dir;`;
     `create/directory [.tmp]`;
 }
+elsif ($Is_MacOS) {
+    rmdir "tmp"; mkdir "tmp";
+}
 else {
     `rm -f tmp 2>/dev/null; mkdir tmp 2>/dev/null`;
 }
 
-chdir './tmp';
+chdir catdir(curdir(), 'tmp');
 
 `/bin/rm -rf a b c x` if -x '/bin/rm';
 
 umask(022);
 
 SKIP: {
-    skip "bogus umask", 1 if ($^O eq 'MSWin32') || ($^O eq 'NetWare') ||  ($^O eq 'epoc'); 
+    skip "bogus umask", 1 if ($^O eq 'MSWin32') || ($^O eq 'NetWare') || ($^O eq 'epoc') || $Is_MacOS;
 
     is((umask(0)&0777), 022, 'umask'),
 }
@@ -261,9 +268,10 @@ close(IOFSCOM);
 # as per UNIX FAQ.
 
 SKIP: {
+# Check truncating a closed file.
     eval { truncate "Iofs.tmp", 5; };
 
-    skip("no truncate - $@", 6) if $@;
+    skip("no truncate - $@", 8) if $@;
 
     is(-s "Iofs.tmp", 5, "truncation to five bytes");
 
@@ -277,8 +285,8 @@ SKIP: {
     print FH "x\n" x 200;
     close FH;
 
-
-       open(FH, ">>Iofs.tmp") or die "Can't open Iofs.tmp for appending";
+# Check truncating an open file.
+    open(FH, ">>Iofs.tmp") or die "Can't open Iofs.tmp for appending";
 
     binmode FH;
     select FH;
@@ -294,27 +302,45 @@ SKIP: {
     if ($needs_fh_reopen) {
 	close (FH); open (FH, ">>Iofs.tmp") or die "Can't reopen Iofs.tmp";
     }
-       
-    if ($^O eq 'vos') {
-     is(-s "Iofs.tmp", 200, "TODO - hit VOS bug posix-973 - fh resize to 200 working (filename check)");
-    } else {
-     is(-s "Iofs.tmp", 200, "fh resize to 200 working (filename check)");
-    }
 
-    ok(truncate(FH, 0), "fh resize to zero");
+    SKIP: {
+        if ($^O eq 'vos') {
+	    skip ("# TODO - hit VOS bug posix-973 - cannot resize an open file below the current file pos.", 5);
+	}
 
-    if ($needs_fh_reopen) {
-	close (FH); open (FH, ">>Iofs.tmp") or die "Can't reopen Iofs.tmp";
-    }
+	is(-s "Iofs.tmp", 200, "fh resize to 200 working (filename check)");
 
-    ok(-z "Iofs.tmp", "fh resize to zero working (filename check)");
+	ok(truncate(FH, 0), "fh resize to zero");
 
-       ok(truncate(FH, 200), "fh resize to 200");
-       is(-s FH, 200, "fh resize to 200 working (FH check)");
+	if ($needs_fh_reopen) {
+	    close (FH); open (FH, ">>Iofs.tmp") or die "Can't reopen Iofs.tmp";
+	}
 
-       ok(truncate(FH, 0), "fh resize to 0");
-       ok(-z FH, "fh resize to 0 working (FH check)");
-    close FH;
+	ok(-z "Iofs.tmp", "fh resize to zero working (filename check)");
+
+	close FH;
+
+	open(FH, ">>Iofs.tmp") or die "Can't open Iofs.tmp for appending";
+
+	binmode FH;
+	select FH;
+	$| = 1;
+	select STDOUT;
+
+	{
+	    use strict;
+	    print FH "x\n" x 200;
+	    ok(truncate(*FH{IO}, 100), "fh resize by IO slot");
+	}
+
+	if ($needs_fh_reopen) {
+	    close (FH); open (FH, ">>Iofs.tmp") or die "Can't reopen Iofs.tmp";
+	}
+
+	is(-s "Iofs.tmp", 100, "fh resize by IO slot working");
+
+	close FH;
+    }
 }
 
 # check if rename() can be used to just change case of filename