Change 11436 by jhi@alpha on 2001/07/22 14:36:43
Subject: [PATCH: perl@11373] Win32 update for t/io/fs.t (may effect NetWare)
From: Prymmer/Kahn <[EMAIL PROTECTED]>
Date: Sat, 21 Jul 2001 12:08:29 -0700 (PDT)
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/t/io/fs.t#29 edit
Differences ...
==== //depot/perl/t/io/fs.t#29 (xtext) ====
Index: perl/t/io/fs.t
--- perl/t/io/fs.t.~1~ Sun Jul 22 08:45:05 2001
+++ perl/t/io/fs.t Sun Jul 22 08:45:05 2001
@@ -136,7 +136,9 @@
chdir $wd || die "Can't cd back to $wd";
unlink 'c';
-if ((($^O eq 'MSWin32') || ($^O eq 'NetWare')) and `ls -l perl 2>/dev/null` =~
/^l.*->/) {
+# Yet another way to look for links (perhaps those that cannot be created by perl?).
+# Hopefully there is an ls utility in your %PATH%. N.B. that $^O is 'cygwin' on
+Cygwin.
+if ((($^O eq 'MSWin32') || ($^O eq 'NetWare')) and `ls -l perl 2>nul` =~ /^l.*->/) {
# we have symbolic links
system("cp TEST TEST$$");
# we have to copy because e.g. GNU grep gets huffy if we have
@@ -149,7 +151,12 @@
unlink("TEST$$");
}
else {
- print "ok 21\nok 22\n";
+ if ( ($^O eq 'MSWin32') || ($^O eq 'NetWare') ) {
+ print "ok 21 # skipped: no link\nok 22 # skipped: no link\n";
+ }
+ else {
+ print "ok 21 # skipped: $^O is neither 'MSWin32' nor 'NetWare'\nok 22 #
+skipped: $^O is neither 'MSWin32' nor 'NetWare'\n";
+ }
}
# truncate (may not be implemented everywhere)
End of Patch.
