From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC PATCHv2 16/16] Add missing &&'s throughout the testsuite
Date: Fri, 24 Sep 2010 23:18:06 +0000 [thread overview]
Message-ID: <AANLkTimfvo-nUDROSKWVFzB0HdAH4MfbH+oU4AP+pRqO@mail.gmail.com> (raw)
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:
> 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
> - 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 ..
> 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.
next prev parent reply other threads:[~2010-09-24 23:18 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-24 22:22 [RFC PATCHv2 00/16] Add missing &&'s in the testsuite Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 01/16] t3020 (ls-files-error-unmatch): remove stray '1' from end of file Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 02/16] t4017 (diff-retval): replace manual exit code check with test_expect_code Elijah Newren
2010-09-24 22:49 ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 03/16] t1001 (read-tree-m-2way): add missing && Elijah Newren
2010-09-24 22:50 ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 04/16] t1002 (read-tree-m-u-2way): " Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 05/16] t4002 (diff-basic): use test_might_fail for commands that might fail Elijah Newren
2010-09-24 22:52 ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 06/16] t4202 (log): Replace '<git-command> || :' with test_might_fail Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 07/16] t3600 (rm): add lots of missing && Elijah Newren
2010-09-24 22:58 ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 08/16] t4019 (diff-wserror): " Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 09/16] t4026 (color): add " Elijah Newren
2010-09-24 22:55 ` Ævar Arnfjörð Bjarmason
2010-09-25 4:02 ` Jeff King
2010-09-25 7:56 ` Jakub Narebski
2010-09-24 22:22 ` [RFC PATCHv2 10/16] t5602 (clone-remote-exec): " Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 11/16] t6016 (rev-list-graph-simplify-history): " Elijah Newren
2010-09-24 23:00 ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 12/16] t6050 (replace): " Elijah Newren
2010-09-24 23:04 ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 13/16] t7001 (mv): " Elijah Newren
2010-09-24 23:00 ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 14/16] t7601 (merge-pull-config): " Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 15/16] t7800 (difftool): " Elijah Newren
2010-09-24 23:02 ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 16/16] Add missing &&'s throughout the testsuite Elijah Newren
2010-09-24 23:18 ` Ævar Arnfjörð Bjarmason [this message]
2010-09-25 16:50 ` Elijah Newren
2010-09-25 17:05 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTimfvo-nUDROSKWVFzB0HdAH4MfbH+oU4AP+pRqO@mail.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).