From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCHv4 07/15] t4019 (diff-wserror): add lots of missing &&
Date: Wed, 29 Sep 2010 12:01:38 -0700 [thread overview]
Message-ID: <7v4od8nzl9.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1285542879-16381-8-git-send-email-newren@gmail.com> (Elijah Newren's message of "Sun\, 26 Sep 2010 17\:14\:31 -0600")
Elijah Newren <newren@gmail.com> writes:
> Also add a test_might_fail in front of the final git_config --unset
> core.whitespace as that value may have already been unset previously.
In general, if a previous one that is designed to set a variable failed
for whatever reason, the next one that does --unset without might-fail
will be broken. So...
> @@ -65,9 +65,9 @@ test_expect_success 'without -trail' '
>
> test_expect_success 'without -trail (attribute)' '
>
> - git config --unset core.whitespace
> - echo "F whitespace=-trail" >.gitattributes
> - prepare_output
> + git config --unset core.whitespace &&
... I think you need might-fail in front of this one, and ...
> + echo "F whitespace=-trail" >.gitattributes &&
> + prepare_output &&
>
> grep Eight normal >/dev/null &&
> grep HT error >/dev/null &&
> @@ -79,9 +79,9 @@ test_expect_success 'without -trail (attribute)' '
>
> test_expect_success 'without -space' '
>
> - rm -f .gitattributes
> - git config core.whitespace -space
> - prepare_output
> + rm -f .gitattributes &&
> + git config core.whitespace -space &&
> + prepare_output &&
>
> grep Eight normal >/dev/null &&
> grep HT normal >/dev/null &&
> @@ -93,9 +93,9 @@ test_expect_success 'without -space' '
>
> test_expect_success 'without -space (attribute)' '
>
> - git config --unset core.whitespace
> - echo "F whitespace=-space" >.gitattributes
> - prepare_output
> + git config --unset core.whitespace &&
... this one, ...
> + echo "F whitespace=-space" >.gitattributes &&
> + prepare_output &&
>
> grep Eight normal >/dev/null &&
> grep HT normal >/dev/null &&
> @@ -107,9 +107,9 @@ test_expect_success 'without -space (attribute)' '
>
> test_expect_success 'with indent-non-tab only' '
>
> - rm -f .gitattributes
> - git config core.whitespace indent,-trailing,-space
> - prepare_output
> + rm -f .gitattributes &&
> + git config core.whitespace indent,-trailing,-space &&
... this one, ...
> + prepare_output &&
>
> grep Eight error >/dev/null &&
> grep HT normal >/dev/null &&
> @@ -121,9 +121,9 @@ test_expect_success 'with indent-non-tab only' '
>
> test_expect_success 'with indent-non-tab only (attribute)' '
>
> - git config --unset core.whitespace
> - echo "F whitespace=indent,-trailing,-space" >.gitattributes
> - prepare_output
> + git config --unset core.whitespace &&
... this one, ...
> + echo "F whitespace=indent,-trailing,-space" >.gitattributes &&
> + prepare_output &&
>
> grep Eight error >/dev/null &&
> grep HT normal >/dev/null &&
> @@ -135,9 +135,9 @@ test_expect_success 'with indent-non-tab only (attribute)' '
>
> test_expect_success 'with cr-at-eol' '
>
> - rm -f .gitattributes
> - git config core.whitespace cr-at-eol
> - prepare_output
> + rm -f .gitattributes &&
> + git config core.whitespace cr-at-eol &&
> + prepare_output &&
>
> grep Eight normal >/dev/null &&
> grep HT error >/dev/null &&
> @@ -149,9 +149,9 @@ test_expect_success 'with cr-at-eol' '
>
> test_expect_success 'with cr-at-eol (attribute)' '
>
> - git config --unset core.whitespace
> - echo "F whitespace=trailing,cr-at-eol" >.gitattributes
> - prepare_output
> + git config --unset core.whitespace &&
... and this one, too.
> + echo "F whitespace=trailing,cr-at-eol" >.gitattributes &&
> + prepare_output &&
>
> grep Eight normal >/dev/null &&
> grep HT error >/dev/null &&
> @@ -179,11 +179,11 @@ test_expect_success 'trailing empty lines (2)' '
> '
>
> test_expect_success 'do not color trailing cr in context' '
> - git config --unset core.whitespace
> + test_might_fail git config --unset core.whitespace &&
> rm -f .gitattributes &&
> echo AAAQ | tr Q "\015" >G &&
> git add G &&
> - echo BBBQ | tr Q "\015" >>G
> + echo BBBQ | tr Q "\015" >>G &&
> git diff --color G | tr "\015" Q >output &&
> grep "BBB.*${blue_grep}Q" output &&
> grep "AAA.*\[mQ" output
> --
> 1.7.3.95.g14291
next prev parent reply other threads:[~2010-09-29 19:02 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-26 23:14 [PATCHv4 00/15] Add missing &&'s in the testsuite Elijah Newren
2010-09-26 23:14 ` [PATCHv4 01/15] t3020 (ls-files-error-unmatch): remove stray '1' from end of file Elijah Newren
2010-09-26 23:14 ` [PATCHv4 02/15] t4017 (diff-retval): replace manual exit code check with test_expect_code Elijah Newren
2010-09-29 18:07 ` Junio C Hamano
2010-09-29 18:45 ` Ævar Arnfjörð Bjarmason
2010-10-01 10:23 ` Jonathan Nieder
2010-10-01 10:38 ` Ævar Arnfjörð Bjarmason
2010-10-01 11:52 ` Jonathan Nieder
2010-10-01 16:20 ` Junio C Hamano
2010-10-01 17:16 ` [PATCH] test-lib: make test_expect_code a test command Ævar Arnfjörð Bjarmason
2010-10-01 17:39 ` Sverre Rabbelier
2010-10-01 17:46 ` Ævar Arnfjörð Bjarmason
2010-10-01 17:47 ` Sverre Rabbelier
2010-10-01 17:42 ` [PATCH v2] " Ævar Arnfjörð Bjarmason
2010-10-01 18:55 ` [PATCH] " Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 03/15] t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing && Elijah Newren
2010-09-29 18:28 ` Junio C Hamano
2010-10-01 10:27 ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 04/15] t4002 (diff-basic): use test_might_fail for commands that might fail Elijah Newren
2010-10-01 10:35 ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 05/15] t4202 (log): Replace '<git-command> || :' with test_might_fail Elijah Newren
2010-09-26 23:14 ` [PATCHv4 06/15] t3600 (rm): add lots of missing && Elijah Newren
2010-10-01 10:48 ` Jonathan Nieder
2010-10-03 2:47 ` Elijah Newren
2010-09-26 23:14 ` [PATCHv4 07/15] t4019 (diff-wserror): " Elijah Newren
2010-09-29 19:01 ` Junio C Hamano [this message]
2010-10-03 3:03 ` Elijah Newren
2010-10-01 11:00 ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 08/15] t4026 (color): remove unneeded and unchained command Elijah Newren
2010-09-26 23:14 ` [PATCHv4 09/15] t5602 (clone-remote-exec): add missing && Elijah Newren
2010-09-29 19:09 ` Junio C Hamano
2010-10-01 11:34 ` Jonathan Nieder
2010-10-03 3:08 ` Elijah Newren
2010-09-26 23:14 ` [PATCHv4 10/15] t6016 (rev-list-graph-simplify-history): " Elijah Newren
2010-09-27 0:10 ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 11/15] t7001 (mv): " Elijah Newren
2010-09-26 23:14 ` [PATCHv4 12/15] t7601 (merge-pull-config): " Elijah Newren
2010-09-26 23:14 ` [PATCHv4 13/15] t7800 (difftool): " Elijah Newren
2010-10-01 11:30 ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 14/15] Add missing &&'s throughout the testsuite Elijah Newren
2010-09-29 19:37 ` Junio C Hamano
2010-10-01 0:48 ` Ævar Arnfjörð Bjarmason
2010-10-01 11:26 ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 15/15] Replace "unset VAR" with "unset VAR;" in testsuite as per t/README Elijah Newren
2010-09-29 19:48 ` Junio C Hamano
2010-09-29 20:28 ` Ævar Arnfjörð Bjarmason
2010-09-29 20:30 ` Elijah Newren
2010-09-30 16:09 ` Junio C Hamano
2010-09-30 21:51 ` Elijah Newren
2010-10-01 11:45 ` Jonathan Nieder
2010-10-01 14:39 ` Sverre Rabbelier
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=7v4od8nzl9.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.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).