From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Tue, 3 May 2005 09:45:24 +0000 (+0000)
Subject: Convert to test.pl
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1d4be626679a02d6ee21fcef2aa72fabf74f2fac;p=p5sagit%2Fp5-mst-13.2.git

Convert to test.pl

p4raw-id: //depot/perl@24376
---

diff --git a/t/op/mkdir.t b/t/op/mkdir.t
index 226089b..6198000 100755
--- a/t/op/mkdir.t
+++ b/t/op/mkdir.t
@@ -1,12 +1,13 @@
 #!./perl
 
-print "1..13\n";
-
 BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
+    require './test.pl';
 }
 
+plan tests => 13;
+
 use File::Path;
 rmtree('blurfl');
 
@@ -14,22 +15,22 @@ rmtree('blurfl');
 $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 ($! =~ /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|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");
+ok(mkdir('blurfl',0777));
+ok(!mkdir('blurfl',0777));
+like($!, qr/cannot move|exist|denied/);
+ok(-d 'blurfl');
+ok(rmdir('blurfl'));
+ok(!rmdir('blurfl'));
+like($!, qr/cannot find|such|exist|not found|not a directory/i);
+ok(mkdir('blurfl'));
+ok(rmdir('blurfl'));
+
+SKIP: {
+    # trailing slashes will be removed before the system call to mkdir
+    # but we don't care for MacOS ...
+    skip("MacOS", 4) if $^O eq 'MacOS';
+    ok(mkdir('blurfl///'));
+    ok(-d 'blurfl');
+    ok(rmdir('blurfl///'));
+    ok(!-d 'blurfl');
 }