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

diff --git a/t/op/mkdir.t b/t/op/mkdir.t
old mode 100644
new mode 100755
index 9186aa5..226089b
--- a/t/op/mkdir.t
+++ b/t/op/mkdir.t
@@ -1,15 +1,35 @@
 #!./perl
 
-# $Header: mkdir.t,v 4.0 91/03/20 01:53:39 lwall Locked $
+print "1..13\n";
 
-print "1..7\n";
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
+}
 
-`rm -rf blurfl`;
+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
 
 print (mkdir('blurfl',0777) ? "ok 1\n" : "not ok 1\n");
 print (mkdir('blurfl',0777) ? "not ok 2\n" : "ok 2\n");
-print ($! =~ /exist/ ? "ok 3\n" : "not ok 3\n");
+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 ($! =~ /such|exist/ ? "ok 7\n" : "not 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");
+}