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 79b91ff..2976f43 100644 (file)
--- a/t/op/chdir.t
+++ b/t/op/chdir.t
@@ -47,7 +47,7 @@ $Cwd = abs_path;
 
 SKIP: {
     skip("no fchdir", 16) unless $has_fchdir;
-    my $has_dirfd = ($Config{d_dirfd} || "") eq "define";
+    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");
@@ -78,9 +78,12 @@ SKIP: {
     ok(-d "op", "verify that we are back");
 
     # And now the ambiguous case
-    ok(opendir(H, "op"), "opendir op") or diag $!;
-    ok(open(H, "<", "base"), "open base") or diag $!;
-    if (($Config{d_dirfd} || "") eq "define") {
+    {
+       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 $!;