X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Fmkdir.t;h=c5a090ca7df4651eb3c1b04b3a356a9888fb9b68;hb=20822f61cc01ab34be1e17db483aceb9d5ec8fb7;hp=acf16c14a420daa48775c52eab898c4d95cb0712;hpb=61ae2fbf8676dafa05a9a9a710fde421f30a2071;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/op/mkdir.t b/t/op/mkdir.t
index acf16c1..c5a090c 100755
--- a/t/op/mkdir.t
+++ b/t/op/mkdir.t
@@ -1,18 +1,25 @@
 #!./perl
 
-# $RCSfile: mkdir.t,v $$Revision: 4.1 $$Date: 92/08/07 18:28:06 $
+print "1..9\n";
 
-print "1..7\n";
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
+}
 
-$^O eq 'MSWin32' ? `del /s /q blurfl 2>&1` : `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|denied/ ? "ok 3\n" : "# $!\nnot 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|not found/i ? "ok 7\n" : "not ok 7\n");
+print ($! =~ /cannot find|such|exist|not found/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");