From: john at keeping.me.uk (John Keeping)
Subject: [PATCH 10/12] t0001: use test_cmp instead of 'diff -u'
Date: Mon, 8 Apr 2013 20:12:39 +0100 [thread overview]
Message-ID: <f84137bb9fc6b410a3be058da6f1b6b5cc3a9e6a.1365448308.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1365448308.git.john@keeping.me.uk>
Signed-off-by: John Keeping <john at keeping.me.uk>
---
tests/t0001-validate-git-versions.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/t0001-validate-git-versions.sh b/tests/t0001-validate-git-versions.sh
index 9591d3e..754046e 100755
--- a/tests/t0001-validate-git-versions.sh
+++ b/tests/t0001-validate-git-versions.sh
@@ -14,7 +14,7 @@ test_expect_success 'extract Git version from Makefile' '
test_expect_success 'test Git version matches Makefile' '
( cat ../../git/GIT-VERSION-FILE || echo "No GIT-VERSION-FILE" ) |
sed -e "s/GIT_VERSION[ ]*=[ ]*//" >git_version &&
- diff -u git_version makefile_version
+ test_cmp git_version makefile_version
'
test_expect_success 'test submodule version matches Makefile' '
@@ -29,7 +29,7 @@ test_expect_success 'test submodule version matches Makefile' '
cd git &&
git describe --match "v[0-9]*" $sm_sha1
) | sed -e "s/^v//" >sm_version &&
- diff -u sm_version makefile_version
+ test_cmp sm_version makefile_version
fi
'
--
1.8.2.694.ga76e9c3.dirty
next prev parent reply other threads:[~2013-04-08 19:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-08 19:12 [PATCH 00/12] Test improvements john
2013-04-08 19:12 ` [PATCH 01/12] tests: use Git test functions directly john
2013-04-08 19:12 ` [PATCH 02/12] tests: don't let Git's test-lib create a repository john
2013-04-08 19:12 ` [PATCH 03/12] tests: remove prepare_tests john
2013-04-08 19:12 ` [PATCH 04/12] t0001: don't setup test repositories john
2013-04-08 19:12 ` [PATCH 05/12] tests/.gitignore: update for using Git's test infrastructure john
2013-04-08 19:12 ` [PATCH 06/12] tests: remove "trash" directory john
2013-04-08 19:12 ` [PATCH 07/12] tests: put cgit onto $PATH john
2013-04-08 19:12 ` [PATCH 08/12] .gitignore: tighten cgit ignore expression john
2013-04-08 19:12 ` [PATCH 09/12] tests: add Valgrind support john
2013-04-08 19:23 ` Jason
2013-04-08 19:12 ` john [this message]
2013-04-08 19:12 ` [PATCH 11/12] tests: use test_line_count where appropriate john
2013-04-08 19:12 ` [PATCH 12/12] tests: use test_create_repo instead of "git init" john
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=f84137bb9fc6b410a3be058da6f1b6b5cc3a9e6a.1365448308.git.john@keeping.me.uk \
--to=cgit@lists.zx2c4.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.
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).