Make some casts explicit to keep VC++ 7 happy

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

diff --git a/t/op/readdir.t b/t/op/readdir.t
index 8e67b65..a56c5b2 100755 (executable)
--- 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;
@@ -24,7 +24,7 @@ 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
 ##
-my ($min, $max) = (115, 135);
+my ($min, $max) = (125, 145);
 if (@D > $min && @D < $max) { print "ok 2\n"; }
 else {
     printf "not ok 2 # counting op/*.t, expect $min < %d < $max files\n",
@@ -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"; }