Re: [RFC PATCHv2 16/16] Add missing &&'s throughout the testsuite
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Sep 24, 2010, 23:18 UTC
- Message-ID
- <AANLkTimfvo-nUDROSKWVFzB0HdAH4MfbH+oU4AP+pRqO@mail.gmail.com>
- In-Reply-To
- <1285366976-22216-17-git-send-email-newren@gmail.com>
On Fri, Sep 24, 2010 at 22:22, Elijah Newren <newren@gmail.com> wrote:
Show 76 quoted lines
> test_expect_success 'plain' ' > ( > - unset GIT_DIR GIT_WORK_TREE > + unset GIT_DIR GIT_WORK_TREE && > mkdir plain && > cd plain && > git init > @@ -48,7 +48,7 @@ test_expect_success 'plain with GIT_WORK_TREE' ' > > test_expect_success 'plain bare' ' > ( > - unset GIT_DIR GIT_WORK_TREE GIT_CONFIG > + unset GIT_DIR GIT_WORK_TREE GIT_CONFIG && > mkdir plain-bare-1 && > cd plain-bare-1 && > git --bare init > @@ -58,7 +58,7 @@ test_expect_success 'plain bare' ' > > test_expect_success 'plain bare with GIT_WORK_TREE' ' > if ( > - unset GIT_DIR GIT_CONFIG > + unset GIT_DIR GIT_CONFIG && > mkdir plain-bare-2 && > cd plain-bare-2 && > GIT_WORK_TREE=$(pwd) git --bare init > @@ -72,7 +72,7 @@ test_expect_success 'plain bare with GIT_WORK_TREE' ' > test_expect_success 'GIT_DIR bare' ' > > ( > - unset GIT_CONFIG > + unset GIT_CONFIG && > mkdir git-dir-bare.git && > GIT_DIR=git-dir-bare.git git init > ) && > @@ -82,7 +82,7 @@ test_expect_success 'GIT_DIR bare' ' > test_expect_success 'init --bare' ' > > ( > - unset GIT_DIR GIT_WORK_TREE GIT_CONFIG > + unset GIT_DIR GIT_WORK_TREE GIT_CONFIG && > mkdir init-bare.git && > cd init-bare.git && > git init --bare > @@ -93,7 +93,7 @@ test_expect_success 'init --bare' ' > test_expect_success 'GIT_DIR non-bare' ' > > ( > - unset GIT_CONFIG > + unset GIT_CONFIG && > mkdir non-bare && > cd non-bare && > GIT_DIR=.git git init > @@ -104,7 +104,7 @@ test_expect_success 'GIT_DIR non-bare' ' > test_expect_success 'GIT_DIR & GIT_WORK_TREE (1)' ' > > ( > - unset GIT_CONFIG > + unset GIT_CONFIG && > mkdir git-dir-wt-1.git && > GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-1.git git init > ) && > @@ -114,7 +114,7 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (1)' ' > test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' ' > > if ( > - unset GIT_CONFIG > + unset GIT_CONFIG && > mkdir git-dir-wt-2.git && > GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-2.git git --bare init > ) > @@ -127,7 +127,7 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' ' > test_expect_success 'reinit' ' > > ( > - unset GIT_CONFIG GIT_WORK_TREE GIT_CONFIG > + unset GIT_CONFIG GIT_WORK_TREE GIT_CONFIG &&
These are all bad, see c289c315c2bfcd5fde99f9e4dbb109f89e29dfce for why. If it's possible maybe we should have a new:
test_returns_whatever unset FOO &&
To make this more self-documenting
Show 13 quoted lines
> - echo "[attr]notest !test" > - echo "f test=f" > - echo "a/i test=a/i" > - echo "onoff test -test" > - echo "offon -test test" > + echo "[attr]notest !test" && > + echo "f test=f" && > + echo "a/i test=a/i" && > + echo "onoff test -test" && > + echo "offon -test test" && > echo "no notest" > ) >.gitattributes && > (
Should just use cat <.gitattributes ...
> - HEAD_entry_count=$(git reflog | wc -l) > - master_entry_count=$(git reflog show master | wc -l) > + HEAD_entry_count=$(git reflog | wc -l) && > + master_entry_count=$(git reflog show master | wc -l) &&
Another thing better as test_cmp ..
Show 7 quoted lines
> test_expect_success 'did not use upload-pack service' ' > - grep '/git-upload-pack' <"$HTTPD_ROOT_PATH"/access.log >act > - : >exp > + grep '/git-upload-pack' <"$HTTPD_ROOT_PATH"/access.log >act && > + : >exp && > test_cmp exp act > '
Maybe change this this to:
>exp &&
Or in a later non-&& series.