From mboxrd@z Thu Jan 1 00:00:00 1970 From: john at keeping.me.uk (John Keeping) Date: Mon, 8 Apr 2013 20:12:39 +0100 Subject: [PATCH 10/12] t0001: use test_cmp instead of 'diff -u' In-Reply-To: References: Message-ID: Signed-off-by: John Keeping --- 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