Re: [PATCH v2] t4027,4041: Use test -s to test for an empty file
On 06/24/2010 03:10 PM, Brian Gernhardt wrote:
Show 13 quoted lines
> The tests had 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'
>
> Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
> ---
>
> Johannes Sixt wrote:
> > Shouldn't you replace these by
> >
> > ! test -s actual2 &&
>
> Yes, you're right. I was just trying to get the tests to run and didn't really pay attention to what it was trying to do.
Show 10 quoted lines
> diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
> index f44b906..db9b64d 100755
> --- a/t/t4041-diff-submodule-option.sh
> +++ b/t/t4041-diff-submodule-option.sh
> @@ -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 -
^^^
I don't think we need the trailing dash on these.
Show 49 quoted lines
> "
>
> 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' "
> @@ -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' "
> @@ -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' "
> @@ -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' "