summaryrefslogtreecommitdiff
path: root/t/t3201-branch-contains.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-03-12 21:36:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-13 07:57:52 (GMT)
commit82ebb0b6ec7470cab96a013d3d719c109003ef83 (patch)
tree8796598a518e972881afd729215c265924c04ddf /t/t3201-branch-contains.sh
parentb4ce54fc61e7c76e2d7f47c34733f0f0bbb6c4cd (diff)
downloadgit-82ebb0b6ec7470cab96a013d3d719c109003ef83.zip
git-82ebb0b6ec7470cab96a013d3d719c109003ef83.tar.gz
git-82ebb0b6ec7470cab96a013d3d719c109003ef83.tar.bz2
add test_cmp function for test scripts
Many scripts compare actual and expected output using "diff -u". This is nicer than "cmp" because the output shows how the two differ. However, not all versions of diff understand -u, leading to unnecessary test failure. This adds a test_cmp function to the test scripts and switches all "diff -u" invocations to use it. The function uses the contents of "$GIT_TEST_CMP" to compare its arguments; the default is "diff -u". On systems with a less-capable diff, you can do: GIT_TEST_CMP=cmp make test Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3201-branch-contains.sh')
-rwxr-xr-xt/t3201-branch-contains.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh
index 9ef593f..b4cf628 100755
--- a/t/t3201-branch-contains.sh
+++ b/t/t3201-branch-contains.sh
@@ -31,7 +31,7 @@ test_expect_success 'branch --contains=master' '
{
echo " master" && echo "* side"
} >expect &&
- diff -u expect actual
+ test_cmp expect actual
'
@@ -41,7 +41,7 @@ test_expect_success 'branch --contains master' '
{
echo " master" && echo "* side"
} >expect &&
- diff -u expect actual
+ test_cmp expect actual
'
@@ -51,7 +51,7 @@ test_expect_success 'branch --contains=side' '
{
echo "* side"
} >expect &&
- diff -u expect actual
+ test_cmp expect actual
'