X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Freaddir.t;h=971a02ada7d23adf90407ecf3797d1d5bf438d98;hb=d279ab826c469db5d93d3d728fdcf1acd9265665;hp=18006991cdaddc77b83b151aba8ed1879f364536;hpb=32c2e4fbb7ba898d9e58e8d2292dd45b8692070d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/op/readdir.t b/t/op/readdir.t
old mode 100644
new mode 100755
index 1800699..971a02a
--- a/t/op/readdir.t
+++ b/t/op/readdir.t
@@ -1,20 +1,55 @@
 #!./perl
 
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
+}
+
 eval 'opendir(NOSUCH, "no/such/directory");';
 if ($@) { print "1..0\n"; exit; }
 
-print "1..3\n";
+print "1..11\n";
+
+for $i (1..2000) {
+    local *OP;
+    opendir(OP, "op") or die "can't opendir: $!";
+    # should auto-closedir() here
+}
 
 if (opendir(OP, "op")) { print "ok 1\n"; } else { print "not ok 1\n"; }
-@D = grep(/^[^\.].*\.t$/, readdir(OP));
+@D = grep(/^[^\.].*\.t$/i, readdir(OP));
 closedir(OP);
 
-if (@D > 20 && @D < 100) { print "ok 2\n"; } else { print "not ok 2\n"; }
+##
+## This range will have to adjust as the number of tests expands,
+## as it's counting the number of .t files in src/t
+##
+my ($min, $max) = (150, 170);
+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 = <op/*.t>;
-while (@R && @G && "op/".$R[0] eq $G[0]) {
+@G = sort <op/*.t>;
+@G = sort <:op:*.t> if $^O eq 'MacOS';
+if ($G[0] =~ m#.*\](\w+\.t)#i) {
+    # grep is to convert filespecs returned from glob under VMS to format
+    # identical to that returned by readdir
+    @G = grep(s#.*\](\w+\.t).*#op/$1#i,<op/*.t>);
+}
+while (@R && @G && $G[0] eq ($^O eq 'MacOS' ? ':op:' : 'op/').$R[0]) {
 	shift(@R);
 	shift(@G);
 }
 if (@R == 0 && @G == 0) { print "ok 3\n"; } else { print "not ok 3\n"; }
+
+if (opendir($fh, "op")) { print "ok 4\n"; } else { print "not ok 4\n"; }
+if (ref($fh) eq 'GLOB') { print "ok 5\n"; } else { print "not ok 5\n"; }
+if (opendir($fh[0], "op")) { print "ok 6\n"; } else { print "not ok 6\n"; }
+if (ref($fh[0]) eq 'GLOB') { print "ok 7\n"; } else { print "not ok 7\n"; }
+if (opendir($fh{abc}, "op")) { print "ok 8\n"; } else { print "not ok 8\n"; }
+if (ref($fh{abc}) eq 'GLOB') { print "ok 9\n"; } else { print "not ok 9\n"; }
+if ("$fh" ne "$fh[0]") { print "ok 10\n"; } else { print "not ok 10\n"; }
+if ("$fh" ne "$fh{abc}") { print "ok 11\n"; } else { print "not ok 11\n"; }