[PATCH 01/11] t5300-pack-object.sh: Split the big verify-pack test into smaller parts.

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Junio C Hamano <gitster@...>
Cc: <git@...>, Johannes Sixt <johannes.sixt@...>
Date: Tuesday, November 13, 2007 - 4:04 pm

This makes it easier to spot which of the tests failed.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
---
 t/t5300-pack-object.sh |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index ba7579c..f1106e6 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -187,49 +187,51 @@ test_expect_success \
 			test-3-${packname_3}.idx'
 
 test_expect_success \
-    'corrupt a pack and see if verify catches' \
+    'verify-pack catches mismatched .idx and .pack files' \
     'cat test-1-${packname_1}.idx >test-3.idx &&
      cat test-2-${packname_2}.pack >test-3.pack &&
      if git verify-pack test-3.idx
      then false
      else :;
-     fi &&
+     fi'
 
-     : PACK_SIGNATURE &&
-     cat test-1-${packname_1}.pack >test-3.pack &&
+test_expect_success \
+    'verify-pack catches a corrupted pack signature' \
+    'cat 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
      then false
      else :;
-     fi &&
+     fi'
 
-     : PACK_VERSION &&
-     cat test-1-${packname_1}.pack >test-3.pack &&
+test_expect_success \
+    'verify-pack catches a corrupted pack version' \
+    'cat 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
      then false
      else :;
-     fi &&
+     fi'
 
-     : TYPE/SIZE byte of the first packed object data &&
-     cat test-1-${packname_1}.pack >test-3.pack &&
+test_expect_success \
+    'verify-pack catches a corrupted type/size of the 1st packed object data' \
+    'cat 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
      then false
      else :;
-     fi &&
+     fi'
 
-     : sum of the index file itself &&
-     l=`wc -c <test-3.idx` &&
+test_expect_success \
+    'verify-pack catches a corrupted sum of the index file itself' \
+    'l=`wc -c <test-3.idx` &&
      l=`expr $l - 20` &&
      cat test-1-${packname_1}.pack >test-3.pack &&
      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 :;
-     fi &&
-
-     :'
+     fi'
 
 test_expect_success \
     'build pack index for an existing pack' \
-- 
1.5.3.5.1592.g0d6db

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/11] Miscellaneous MinGW port fallout, Johannes Sixt, (Tue Nov 13, 4:04 pm)
Re: [PATCH 0/11] Miscellaneous MinGW port fallout, Junio C Hamano, (Wed Nov 14, 7:02 am)
Re: [PATCH 0/11] Miscellaneous MinGW port fallout, Johannes Schindelin, (Wed Nov 14, 10:50 am)
Re: [PATCH 0/11] Miscellaneous MinGW port fallout, Junio C Hamano, (Wed Nov 14, 4:13 pm)
Re: [PATCH 0/11] Miscellaneous MinGW port fallout, Johannes Schindelin, (Wed Nov 14, 4:45 pm)
Re: [PATCH 0/11] Miscellaneous MinGW port fallout, Johannes Sixt, (Tue Nov 13, 4:10 pm)
Re: [PATCH 0/11] Miscellaneous MinGW port fallout, Junio C Hamano, (Tue Nov 13, 5:10 pm)
Re: [PATCH 0/11] Miscellaneous MinGW port fallout, Johannes Sixt, (Tue Nov 13, 5:32 pm)
Re: [PATCH 0/11] Miscellaneous MinGW port fallout, Johannes Schindelin, (Tue Nov 13, 5:46 pm)
Re: [PATCH 0/11] Miscellaneous MinGW port fallout, Junio C Hamano, (Tue Nov 13, 6:22 pm)
Re: [PATCH 0/11] Miscellaneous MinGW port fallout, Johannes Sixt, (Tue Nov 13, 5:54 pm)
[PATCH 01/11] t5300-pack-object.sh: Split the big verify-pac..., Johannes Sixt, (Tue Nov 13, 4:04 pm)