t5300: avoid false failures.

Johannes found that the test has 1/256 chance of falsely
producing an uncorrupted idx file, causing the check to detect
corruption fail.  Now we have 1/2^160 chance of false failure
;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 7dfb1ab77b070447c4dd2b9f645785feec6f5480..1510ea9fcc2f02a6c7490d0a613111859140a298 100755 (executable)
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -142,6 +142,7 @@ test_expect_success \
      else :;
      fi &&
 
      else :;
      fi &&
 

+     : PACK_SIGNATURE &&

      cp test-1-${packname_1}.pack test-3.pack &&
      dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=2 &&
      if git-verify-pack test-3.idx
      cp test-1-${packname_1}.pack test-3.pack &&
      dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=2 &&
      if git-verify-pack test-3.idx


@@ -149,6 +150,7 @@ test_expect_success \
      else :;
      fi &&
 
      else :;
      fi &&
 

+     : PACK_VERSION &&

      cp test-1-${packname_1}.pack test-3.pack &&
      dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=7 &&
      if git-verify-pack test-3.idx
      cp test-1-${packname_1}.pack test-3.pack &&
      dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=7 &&
      if git-verify-pack test-3.idx


@@ -156,6 +158,7 @@ test_expect_success \
      else :;
      fi &&
 
      else :;
      fi &&
 

+     : TYPE/SIZE byte of the first packed object data &&

      cp test-1-${packname_1}.pack test-3.pack &&
      dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=12 &&
      if git-verify-pack test-3.idx
      cp test-1-${packname_1}.pack test-3.pack &&
      dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=12 &&
      if git-verify-pack test-3.idx


@@ -163,8 +166,11 @@ test_expect_success \
      else :;
      fi &&
 
      else :;
      fi &&
 

+     : sum of the index file itself &&
+     l=`wc -c <test-3.idx` &&
+     l=`expr "$l" - 20` &&

      cp test-1-${packname_1}.pack test-3.pack &&
      cp test-1-${packname_1}.pack test-3.pack &&

-     dd if=/dev/zero of=test-3.idx count=1 bs=1 conv=notrunc seek=1200 &&
+     dd if=/dev/zero of=test-3.idx count=20 bs=1 conv=notrunc seek=$l &&

      if git-verify-pack test-3.pack
      then false
      else :;
      if git-verify-pack test-3.pack
      then false
      else :;