Integrate mainline

[p5sagit/p5-mst-13.2.git] / t / op / readdir.t

diff --git a/t/op/readdir.t b/t/op/readdir.t
index ad7a8ab..8e67b65 100755 (executable)
--- a/t/op/readdir.t
+++ b/t/op/readdir.t
@@ -2,13 +2,13 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib';
+    @INC = '../lib';
 }
 
 eval 'opendir(NOSUCH, "no/such/directory");';
 if ($@) { print "1..0\n"; exit; }
 
-print "1..3\n";
+print "1..6\n";
 
 for $i (1..2000) {
     local *OP;
@@ -24,7 +24,12 @@ closedir(OP);
 ## This range will have to adjust as the number of tests expands,
 ## as it's counting the number of .t files in src/t
 ##
-if (@D > 90 && @D < 110) { print "ok 2\n"; } else { print "not ok 2\n"; }
+my ($min, $max) = (115, 135);
+if (@D > $min && @D < $max) { print "ok 2\n"; }
+else {
+    printf "not ok 2 # counting op/*.t, expect $min < %d < $max files\n",
+      scalar @D;
+}
 
 @R = sort @D;
 @G = sort <op/*.t>;
@@ -38,3 +43,25 @@ while (@R && @G && "op/".$R[0] eq $G[0]) {
        shift(@G);
 }
 if (@R == 0 && @G == 0) { print "ok 3\n"; } else { print "not ok 3\n"; }
+
+# Can't really depend on Tru64 UTF-8 filenames being so must just see
+# that things don't crash and that *if* UTF-8 were to be received, it's
+# valid.  (Maybe later add checks that are run if we are on NTFS/HFS+.)
+# (see also ext/File/Glob/t/utf8.t)
+
+opendir(OP, ":utf8", "op");
+
+my $a = readdir(OP);
+
+print utf8::valid($a) ? "ok 4\n" : "not ok 4\n";
+
+my @a = readdir(OP);
+
+print utf8::valid($a[0]) ? "ok 5\n" : "not ok 5\n";
+
+# But we can check for bogus mode arguments.
+
+eval { opendir(OP, ":foo", "op") };
+
+print $@ =~ /Unknown discipline ':foo'/ ? "ok 6\n" : "not ok 6\n";
+