Properly return a syntax error instead of segfaulting if each/keys/values is used...

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

diff --git a/t/op/filetest.t b/t/op/filetest.t
old mode 100755 (executable)
new mode 100644 (file)
index 59ed0be..4659c70
--- a/t/op/filetest.t
+++ b/t/op/filetest.t
@@ -18,9 +18,15 @@ ok( !-f 'op' );
 ok( !-d 'TEST' );
 ok( -r 'TEST' );
 
-# make sure TEST is r-x
-eval { chmod 0555, 'TEST' or die "chmod 0555, 'TEST' failed: $!" };
-chomp ($bad_chmod = $@);
+# Make a read only file
+my $ro_file = tempfile();
+
+{
+    open my $fh, '>', $ro_file or die "open $fh: $!";
+    close $fh or die "close $fh: $!";
+}
+
+chmod 0555, $ro_file or die "chmod 0555, '$ro_file' failed: $!";
 
 $oldeuid = $>;         # root can read and write anything
 eval '$> = 1';         # so switch uid (may not be implemented)
@@ -31,14 +37,8 @@ SKIP: {
     if (!$Config{d_seteuid}) {
        skip('no seteuid');
     } 
-    elsif ($Config{config_args} =~/Dmksymlinks/) {
-       skip('we cannot chmod symlinks');
-    }
-    elsif ($bad_chmod) {
-       skip( $bad_chmod );
-    }
     else {
-       ok( !-w 'TEST' );
+       ok( !-w $ro_file );
     }
 }
 
@@ -101,8 +101,9 @@ my $over;
     package OverFtest;
 
     use overload 
+       fallback => 1,
         -X => sub { 
-            $over = [overload::StrVal($_[0]), $_[1]];
+            $over = [qq($_[0]), $_[1]];
             "-$_[1]"; 
         };
 }
@@ -131,11 +132,11 @@ my $over;
 }
 
 my $ft = bless [], "OverFtest";
-my $ftstr = overload::StrVal($ft);
+my $ftstr = qq($ft);
 my $str = bless [], "OverString";
 my $both = bless [], "OverBoth";
 my $neither = bless [], "OverNeither";
-my $nstr = overload::StrVal($neither);
+my $nstr = qq($neither);
 
 open my $gv, "<", "TEST";
 bless $gv, "OverString";
@@ -143,6 +144,9 @@ open my $io, "<", "TEST";
 $io = *{$io}{IO};
 bless $io, "OverString";
 
+my $fcntl_not_available;
+eval { require Fcntl } or $fcntl_not_available = 1;
+
 for my $op (split //, "rwxoRWXOezsfdlpSbctugkTMBAC") {
     $over = [];
     ok( my $rv = eval "-$op \$ft",  "overloaded -$op succeeds" )
@@ -151,19 +155,34 @@ for my $op (split //, "rwxoRWXOezsfdlpSbctugkTMBAC") {
     is( $over->[1], $op,            "correct op for overloaded -$op" );
     is( $rv,        "-$op",         "correct return value for overloaded -$op");
 
+    my ($exp, $is) = (1, "is");
+    if (
+       !$fcntl_not_available and (
+        $op eq "u" and not eval { Fcntl::S_ISUID() } or
+        $op eq "g" and not eval { Fcntl::S_ISGID() } or
+        $op eq "k" and not eval { Fcntl::S_ISVTX() }
+       )
+    ) {
+        ($exp, $is) = (0, "not");
+    }
+
     $over = 0;
     $rv = eval "-$op \$str";
     ok( !$@,                        "-$op succeeds with string overloading" )
         or diag( $@ );
     is( $rv, eval "-$op 'TEST'",    "correct -$op on string overload" );
-    is( $over,      1,              "string overload called for -$op" );
+    is( $over,      $exp,           "string overload $is called for -$op" );
 
-    my ($exp, $is) = $op eq "l" ? (1, "is") : (0, "not");
+    ($exp, $is) = $op eq "l" ? (1, "is") : (0, "not");
 
     $over = 0;
     eval "-$op \$gv";
     is( $over,      $exp,   "string overload $is called for -$op on GLOB" );
 
+    # IO refs always get string overload called. This might be a bug.
+    $op eq "t" || $op eq "T" || $op eq "B"
+        and ($exp, $is) = (1, "is");
+
     $over = 0;
     eval "-$op \$io";
     is( $over,      $exp,   "string overload $is called for -$op on IO");