X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/f6aa80235c3fbb719271d2e0f4463ba710cceea6..83c555564918110c20f99f55c77d9dfc27f217fb:/t/op/filetest.t

diff --git a/t/op/filetest.t b/t/op/filetest.t
old mode 100755
new mode 100644
index 0fec3c1..4659c70
--- a/t/op/filetest.t
+++ b/t/op/filetest.t
@@ -10,7 +10,7 @@ BEGIN {
 }
 
 use Config;
-plan(tests => 28 + 27*10);
+plan(tests => 28 + 27*14);
 
 ok( -d 'op' );
 ok( -f 'TEST' );
@@ -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 );
     }
 }
 
@@ -100,10 +100,12 @@ my $over;
 {
     package OverFtest;
 
-    use overload -X => sub { 
-        $over = [overload::StrVal($_[0]), $_[1]];
-        "-$_[1]"; 
-    };
+    use overload 
+	fallback => 1,
+        -X => sub { 
+            $over = [qq($_[0]), $_[1]];
+            "-$_[1]"; 
+        };
 }
 {
     package OverString;
@@ -122,7 +124,7 @@ my $over;
 {
     package OverNeither;
 
-    # Need fallback. Previous veraions of perl required 'fallback' to do
+    # Need fallback. Previous versions of perl required 'fallback' to do
     # -X operations on an object with no "" overload.
     use overload 
         '+' => sub { 1 },
@@ -130,11 +132,20 @@ 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";
+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 = [];
@@ -144,12 +155,37 @@ 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" );
+
+    ($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");
 
     $rv = eval "-$op \$both";
     is( $rv,        "-$op",         "correct -$op on string/-X overload" );
@@ -158,6 +194,7 @@ for my $op (split //, "rwxoRWXOezsfdlpSbctugkTMBAC") {
     ok( !$@,                        "-$op succeeds with random overloading" )
         or diag( $@ );
     is( $rv, eval "-$op \$nstr",    "correct -$op with random overloading" );
-}
 
-is( -r -f $ft,  "-r",               "stacked overloaded -X" );
+    is( eval "-r -$op \$ft", "-r",      "stacked overloaded -$op" );
+    is( eval "-$op -r \$ft", "-$op",    "overloaded stacked -$op" );
+}