Skip to content

Commit

Permalink
t4027,4041: Use test -s to test for an empty file
Browse files Browse the repository at this point in the history
The tests used a mixture of 'echo -n' (which is non-portable) and either
test_cmp or diff to check if a file is empty.  The much easier and portable
method to check for an empty file is '! test -s'

While we're in t4027, there was an excess test_done.  Remove it.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Brian Gernhardt authored and Junio C Hamano committed Jun 25, 2010
1 parent dd44d41 commit 6ed7dda
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions t/t4027-diff-submodule.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)'
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual.body &&
git diff --ignore-submodules HEAD >actual2 &&
echo -n "" | test_cmp - actual2 &&
! test -s actual2 &&
git diff --ignore-submodules=untracked HEAD >actual3 &&
sed -e "1,/^@@/d" actual3 >actual3.body &&
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual3.body &&
git diff --ignore-submodules=dirty HEAD >actual4 &&
echo -n "" | test_cmp - actual4
! test -s actual4
'
test_done

test_expect_success 'git diff HEAD with dirty submodule (index, refs match)' '
(
cd sub &&
Expand All @@ -139,11 +139,11 @@ test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match)'
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual.body &&
git diff --ignore-submodules=all HEAD >actual2 &&
echo -n "" | test_cmp - actual2 &&
! test -s actual2 &&
git diff --ignore-submodules=untracked HEAD >actual3 &&
echo -n "" | test_cmp - actual3 &&
! test -s actual3 &&
git diff --ignore-submodules=dirty HEAD >actual4 &&
echo -n "" | test_cmp - actual4
! test -s actual4
'

test_expect_success 'git diff (empty submodule dir)' '
Expand Down
14 changes: 7 additions & 7 deletions t/t4041-diff-submodule-option.sh
Original file line number Diff line number Diff line change
Expand Up @@ -207,17 +207,17 @@ EOF

test_expect_success 'submodule contains untracked content (untracked ignored)' "
git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
echo -n '' | diff actual -
! test -s actual
"

test_expect_success 'submodule contains untracked content (dirty ignored)' "
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
echo -n '' | diff actual -
! test -s actual
"

test_expect_success 'submodule contains untracked content (all ignored)' "
git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
echo -n '' | diff actual -
! test -s actual
"

test_expect_success 'submodule contains untracked and modifed content' "
Expand All @@ -240,13 +240,13 @@ EOF
test_expect_success 'submodule contains untracked and modifed content (dirty ignored)' "
echo new > sm1/foo6 &&
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
echo -n '' | diff actual -
! test -s actual
"

test_expect_success 'submodule contains untracked and modifed content (all ignored)' "
echo new > sm1/foo6 &&
git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
echo -n '' | diff actual -
! test -s actual
"

test_expect_success 'submodule contains modifed content' "
Expand Down Expand Up @@ -295,7 +295,7 @@ EOF

test_expect_success 'modified submodule contains untracked content (all ignored)' "
git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
echo -n '' | diff actual -
! test -s actual
"

test_expect_success 'modified submodule contains untracked and modifed content' "
Expand Down Expand Up @@ -331,7 +331,7 @@ EOF
test_expect_success 'modified submodule contains untracked and modifed content (all ignored)' "
echo modification >> sm1/foo6 &&
git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
echo -n '' | diff actual -
! test -s actual
"

test_expect_success 'modified submodule contains modifed content' "
Expand Down

0 comments on commit 6ed7dda

Please sign in to comment.