Re: [ID 20001229.001] Not OK: perl v5.7.0 +DEVEL8221 on i686-linux 2.4.0-test13pre4...

Message-ID: <m3vgs1a8ye.fsf@ak-71.mind.de>

The 32-bit wraparound test wasn't quite right.

p4raw-id: //depot/perl@8278

diff --git a/t/lib/syslfs.t b/t/lib/syslfs.t
index cd82dfb..f04b115 100644 (file)
--- a/t/lib/syslfs.t
+++ b/t/lib/syslfs.t
@@ -174,10 +174,18 @@ sub offset ($$) {
     unless ($offset_is == $offset_want) {
         print "# bad offset $offset_is, want $offset_want\n";
        if (unpack("L", pack("L", $offset_want)) == $offset_is) {
-           my $offset_func = ($offset_will_be =~ /^(\w+)/);
+           my($offset_func) = ($offset_will_be =~ /^(\w+)/);
            print "# 32-bit wraparound suspected in $offset_func() since\n";
            print "# $offset_want cast into 32 bits is $offset_is.\n";
-       }
+       } elsif ($offset_want - unpack("L", pack("L", $offset_want)) - 1
+                == $offset_is){
+           my($offset_func) = ($offset_will_be =~ /^(\w+)/);
+           print "# 32-bit wraparound suspected in $offset_func() since\n";
+           printf "# %s - unpack('L', pack('L', %s)) - 1 equals %s.\n",
+               $offset_want,
+               $offset_want,
+               $offset_is;
+        }
         fail;
     }
 }

diff --git a/t/op/lfs.t b/t/op/lfs.t
index e04e1a1..0ae3182 100644 (file)
--- a/t/op/lfs.t
+++ b/t/op/lfs.t
@@ -177,10 +177,18 @@ sub offset ($$) {
     unless ($offset_is == $offset_want) {
         print "# bad offset $offset_is, want $offset_want\n";
        if (unpack("L", pack("L", $offset_want)) == $offset_is) {
-           my $offset_func = ($offset_will_be =~ /^(\w+)/);
+           my($offset_func) = ($offset_will_be =~ /^(\w+)/);
            print "# 32-bit wraparound suspected in $offset_func() since\n";
            print "# $offset_want cast into 32 bits is $offset_is.\n";
-       }
+       } elsif ($offset_want - unpack("L", pack("L", $offset_want)) - 1
+                == $offset_is){
+           my($offset_func) = ($offset_will_be =~ /^(\w+)/);
+           print "# 32-bit wraparound suspected in $offset_func() since\n";
+           printf "# %s - unpack('L', pack('L', %s)) - 1 equals %s.\n",
+               $offset_want,
+               $offset_want,
+               $offset_is;
+        }
         fail;
     }
 }