X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Fwrite.t;h=a86b4ebb9ab46eb8a125c3177b63c4f72ed64d11;hb=a4c04bdcc508b6a45f83e703d0f82401445aa55b;hp=e5baaa470c065d7699d1171515ac9d4cd1bcaa1e;hpb=c4ea979ceac56664f1fc8fd2d684b3f750ba2c82;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/op/write.t b/t/op/write.t
index e5baaa4..a86b4eb 100755
--- a/t/op/write.t
+++ b/t/op/write.t
@@ -7,7 +7,9 @@ BEGIN {
 
 print "1..44\n";
 
-my $CAT = ($^O eq 'MSWin32') ? 'type' : 'cat';
+my $CAT = ($^O eq 'MSWin32' || $^O eq 'NetWare') ? 'type'
+	: ($^O eq 'MacOS') ? 'catenate'
+        : 'cat';
 
 format OUT =
 the quick brown @<<
@@ -271,6 +273,12 @@ else
 
 # 12..44: scary format testing from Merijn H. Brand
 
+if ($^O eq 'VMS' || $^O eq 'MSWin32' || $^O eq 'dos' ||
+    ($^O eq 'os2' and not eval '$OS2::can_fork')) {
+  foreach (12..44) { print "ok $_ # skipped: '|-' and '-|' not supported\n"; }
+  exit(0);
+}
+
 use strict;	# Amazed that this hackery can be made strict ...
 
 # Just a complete test for format, including top-, left- and bottom marging
@@ -282,7 +290,9 @@ my $tm =  1;		# Top margin (empty lines before first output)
 my $bm =  2;		# Bottom marging (empty lines between last text and footer)
 my $lm =  4;		# Left margin (indent in spaces)
 
+select ((select (STDOUT), $| = 1)[0]);
 if ($lm > 0 and !open STDOUT, "|-") {	# Left margin (in this test ALWAYS set)
+    select ((select (STDOUT), $| = 1)[0]);
     my $i = 12;
     my $s = " " x $lm;
     while (<STDIN>) {