From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCHv3 07/16] t4019 (diff-wserror): add lots of missing &&
Date: Sat, 25 Sep 2010 13:06:58 -0600 [thread overview]
Message-ID: <1285441627-28233-8-git-send-email-newren@gmail.com> (raw)
In-Reply-To: <1285441627-28233-1-git-send-email-newren@gmail.com>
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.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
t/t4019-diff-wserror.sh | 52 +++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/t/t4019-diff-wserror.sh b/t/t4019-diff-wserror.sh
index f6d1f1e..2557ec7 100755
--- a/t/t4019-diff-wserror.sh
+++ b/t/t4019-diff-wserror.sh
@@ -40,7 +40,7 @@ prepare_output () {
test_expect_success default '
- prepare_output
+ prepare_output &&
grep Eight normal >/dev/null &&
grep HT error >/dev/null &&
@@ -52,8 +52,8 @@ test_expect_success default '
test_expect_success 'without -trail' '
- git config core.whitespace -trail
- prepare_output
+ git config core.whitespace -trail &&
+ prepare_output &&
grep Eight normal >/dev/null &&
grep HT error >/dev/null &&
@@ -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 &&
+ 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 &&
+ 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 &&
+ 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 &&
+ 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 &&
+ 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-25 19:06 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-25 19:06 [PATCHv3 00/16] Add missing &&'s in the testsuite Elijah Newren
2010-09-25 19:06 ` [PATCHv3 01/16] t3020 (ls-files-error-unmatch): remove stray '1' from end of file Elijah Newren
2010-09-25 19:06 ` [PATCHv3 02/16] t4017 (diff-retval): replace manual exit code check with test_expect_code Elijah Newren
2010-09-25 19:06 ` [PATCHv3 03/16] t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing && Elijah Newren
2010-09-25 19:06 ` [PATCHv3 04/16] t4002 (diff-basic): use test_might_fail for commands that might fail Elijah Newren
2010-09-25 19:06 ` [PATCHv3 05/16] t4202 (log): Replace '<git-command> || :' with test_might_fail Elijah Newren
2010-09-25 19:06 ` [PATCHv3 06/16] t3600 (rm): add lots of missing && Elijah Newren
2010-09-25 19:06 ` Elijah Newren [this message]
2010-09-25 19:06 ` [PATCHv3 08/16] t4026 (color): add " Elijah Newren
2010-09-26 3:38 ` Jeff King
2010-09-26 12:39 ` Elijah Newren
2010-09-25 19:07 ` [PATCHv3 09/16] t5602 (clone-remote-exec): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 10/16] t6016 (rev-list-graph-simplify-history): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 11/16] t6050 (replace): " Elijah Newren
2010-09-26 5:22 ` Christian Couder
2010-09-25 19:07 ` [PATCHv3 12/16] t7001 (mv): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 13/16] t7601 (merge-pull-config): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 14/16] t7800 (difftool): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 15/16] Add missing &&'s throughout the testsuite Elijah Newren
2010-09-25 19:38 ` Ævar Arnfjörð Bjarmason
2010-09-25 19:48 ` Elijah Newren
2010-09-25 19:07 ` [PATCHv3 16/16] Replace "unset VAR" with "unset VAR;" in testsuite as per t/README Elijah Newren
2010-09-25 19:39 ` [PATCHv3 00/16] Add missing &&'s in the testsuite Ævar Arnfjörð Bjarmason
2010-09-25 21:07 ` Elijah Newren
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1285441627-28233-8-git-send-email-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).