X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Fmkdir.t;h=226089b0c8f7d9bcc2932579ba5b062248b570c4;hb=3ab3c9b49fb213f2b1d4cda8797de17be82b2b15;hp=e9460239b2c65efd17bf8dfb07796409a3ed9a5c;hpb=7a1f88acf2a2aec3c61c878c837070234df78c08;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/op/mkdir.t b/t/op/mkdir.t
index e946023..226089b 100755
--- a/t/op/mkdir.t
+++ b/t/op/mkdir.t
@@ -1,18 +1,15 @@
 #!./perl
 
-# $RCSfile: mkdir.t,v $$Revision: 4.1 $$Date: 92/08/07 18:28:06 $
+print "1..13\n";
 
-print "1..7\n";
-
-if ($^O eq 'VMS') { # May as well test the library too
-  unshift @INC, '../lib';
-  require File::Path;
-  File::Path::rmtree('blurfl');
-}
-else {
-  $^O eq 'MSWin32' ? `del /s /q blurfl 2>&1` : `rm -rf blurfl`;
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
 }
 
+use File::Path;
+rmtree('blurfl');
+
 # tests 3 and 7 rather naughtily expect English error messages
 $ENV{'LC_ALL'} = 'C';
 $ENV{LANGUAGE} = 'C'; # GNU locale extension
@@ -23,4 +20,16 @@ print ($! =~ /cannot move|exist|denied/ ? "ok 3\n" : "# $!\nnot ok 3\n");
 print (-d 'blurfl' ? "ok 4\n" : "not ok 4\n");
 print (rmdir('blurfl') ? "ok 5\n" : "not ok 5\n");
 print (rmdir('blurfl') ? "not ok 6\n" : "ok 6\n");
-print ($! =~ /cannot find|such|exist|not found/i ? "ok 7\n" : "# $!\nnot ok 7\n");
+print ($! =~ /cannot find|such|exist|not found|not a directory/i ? "ok 7\n" : "# $!\nnot ok 7\n");
+print (mkdir('blurfl') ? "ok 8\n" : "not ok 8\n");
+print (rmdir('blurfl') ? "ok 9\n" : "not ok 9\n");
+# trailing slashes will be removed before the system call to mkdir
+# but we don't care for MacOS ...
+if ($^O eq 'MacOS') {
+   print "ok $_\n" for 10..13;
+} else {
+   print (mkdir('blurfl///') ? "ok 10\n" : "not ok 10\n");
+   print (-d 'blurfl' ? "ok 11\n" : "not ok 11\n");
+   print (rmdir('blurfl///') ? "ok 12\n" : "not ok 12\n");
+   print (!-d 'blurfl' ? "ok 13\n" : "not ok 13\n");
+}