From 8eafa3da62297eb91741321281fd3fb2a4236e97 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Tue, 27 Dec 2005 10:51:23 -0800
Subject: Guard a test against wc that pads its output with whitespace

Spotted by Johannes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 t/t5300-pack-object.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 't')

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 1510ea9fc..de45ac4e0 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -168,7 +168,7 @@ test_expect_success \
 
      : sum of the index file itself &&
      l=`wc -c <test-3.idx` &&
-     l=`expr "$l" - 20` &&
+     l=`expr $l - 20` &&
      cp 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
-- 
cgit v1.2.1


From e9add360074068eac974c5a69f91ae78a30606e9 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Tue, 27 Dec 2005 11:06:43 -0800
Subject: Fix bogus tests on rev-list output.

These tests seem to mean checking the output with expected
result, but was not doing its handrolled test helper function.

Also fix the guard to workaround wc output that have whitespace
padding, which was broken but not exposed because the test was
not testing it ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 t/t6001-rev-list-merge-order.sh | 2 +-
 t/t6003-rev-list-topo-order.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 't')

diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index 8ec9ebb98..368b8d9e0 100755
--- a/t/t6001-rev-list-merge-order.sh
+++ b/t/t6001-rev-list-merge-order.sh
@@ -110,7 +110,7 @@ save_tag g4 unique_commit g6 tree -p g3 -p h2
 
 git-update-ref HEAD $(tag l5)
 
-test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -s " "' <<EOF
+test_output_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -d \" \"' <<EOF
 19
 EOF
 
diff --git a/t/t6003-rev-list-topo-order.sh b/t/t6003-rev-list-topo-order.sh
index 98f9a1e67..d99a9ad39 100755
--- a/t/t6003-rev-list-topo-order.sh
+++ b/t/t6003-rev-list-topo-order.sh
@@ -79,7 +79,7 @@ save_tag g4 unique_commit g6 tree -p g3 -p h2
 
 git-update-ref HEAD $(tag l5)
 
-test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -s " "' <<EOF
+test_output_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -d \" \"' <<EOF
 19
 EOF
 
-- 
cgit v1.2.1