X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Freaddir.t;h=ee641227b7b1d6a98a0d5de8491f7930ac4b4380;hb=e081bb54e0eecfb962e7f0cfd84fcbdb2683d54d;hp=8e67b65da62b1abb1850365b666242a8b312e8f7;hpb=80a5d8e74b5512d4ab704d0e83466ae41247ce55;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/op/readdir.t b/t/op/readdir.t
index 8e67b65..ee64122 100755
--- a/t/op/readdir.t
+++ b/t/op/readdir.t
@@ -8,7 +8,7 @@ BEGIN {
 eval 'opendir(NOSUCH, "no/such/directory");';
 if ($@) { print "1..0\n"; exit; }
 
-print "1..6\n";
+print "1..11\n";
 
 for $i (1..2000) {
     local *OP;
@@ -33,35 +33,23 @@ else {
 
 @R = sort @D;
 @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 && "op/".$R[0] eq $G[0]) {
+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"; }
 
-# 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";
-
+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"; }