Warning bit fixes to t/op/caller.t

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

diff --git a/t/op/chdir.t b/t/op/chdir.t
index 5b5ca3f..2976f43 100644 (file)
--- a/t/op/chdir.t
+++ b/t/op/chdir.t
@@ -9,11 +9,14 @@ BEGIN {
 
 use Config;
 require "test.pl";
-plan(tests => 41);
+plan(tests => 48);
 
 my $IsVMS   = $^O eq 'VMS';
 my $IsMacOS = $^O eq 'MacOS';
 
+# For an op regression test, I don't want to rely on "use constant" working.
+my $has_fchdir = ($Config{d_fchdir} || "") eq "define";
+
 # Might be a little early in the testing process to start using these,
 # but I can't think of a way to write this test without them.
 use File::Spec::Functions qw(:DEFAULT splitdir rel2abs splitpath);
@@ -43,18 +46,19 @@ SKIP: {
 $Cwd = abs_path;
 
 SKIP: {
-    skip("no fchdir", 9) unless ($Config{d_fchdir} || "") eq "define";
+    skip("no fchdir", 16) unless $has_fchdir;
+    my $has_dirfd = ($Config{d_dirfd} || $Config{d_dir_dd_fd} || "") eq "define";
     ok(opendir(my $dh, "."), "opendir .");
     ok(open(my $fh, "<", "op"), "open op");
     ok(chdir($fh), "fchdir op");
     ok(-f "chdir.t", "verify that we are in op");
-    if (($Config{d_dirfd} || "") eq "define") {
+    if ($has_dirfd) {
        ok(chdir($dh), "fchdir back");
     }
     else {
        eval { chdir($dh); };
        like($@, qr/^The dirfd function is unimplemented at/, "dirfd is unimplemented");
-       chdir "..";
+       chdir ".." or die $!;
     }
 
     # same with bareword file handles
@@ -63,19 +67,43 @@ SKIP: {
     *FH = $fh;
     ok(chdir FH, "fchdir op bareword");
     ok(-f "chdir.t", "verify that we are in op");
-    if (($Config{d_dirfd} || "") eq "define") {
+    if ($has_dirfd) {
        ok(chdir DH, "fchdir back bareword");
     }
     else {
        eval { chdir(DH); };
        like($@, qr/^The dirfd function is unimplemented at/, "dirfd is unimplemented");
-       chdir "..";
+       chdir ".." or die $!;
     }
     ok(-d "op", "verify that we are back");
+
+    # And now the ambiguous case
+    {
+       no warnings qw<io deprecated>;
+       ok(opendir(H, "op"), "opendir op") or diag $!;
+       ok(open(H, "<", "base"), "open base") or diag $!;
+    }
+    if ($has_dirfd) {
+       ok(chdir(H), "fchdir to op");
+       ok(-f "chdir.t", "verify that we are in 'op'");
+       chdir ".." or die $!;
+    }
+    else {
+       eval { chdir(H); };
+       like($@, qr/^The dirfd function is unimplemented at/,
+            "dirfd is unimplemented");
+       SKIP: {
+           skip("dirfd is unimplemented");
+       }
+    }
+    ok(closedir(H), "closedir");
+    ok(chdir(H), "fchdir to base");
+    ok(-f "cond.t", "verify that we are in 'base'");
+    chdir ".." or die $!;
 }
 
 SKIP: {
-    skip("has fchdir", 1) if ($Config{d_fchdir} || "") eq "define";
+    skip("has fchdir", 1) if $has_fchdir;
     opendir(my $dh, "op");
     eval { chdir($dh); };
     like($@, qr/^The fchdir function is unimplemented at/, "fchdir is unimplemented");