diff options
| author | Jeff King <peff@peff.net> | 2008-03-12 22:36:36 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-13 08:57:52 +0100 |
| commit | 82ebb0b6ec7470cab96a013d3d719c109003ef83 (patch) | |
| tree | 8796598a518e972881afd729215c265924c04ddf /t/t3405-rebase-malformed.sh | |
| parent | remove use of "tail -n 1" and "tail -1" (diff) | |
| download | git-82ebb0b6ec7470cab96a013d3d719c109003ef83.tar.xz git-82ebb0b6ec7470cab96a013d3d719c109003ef83.zip | |
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/t3405-rebase-malformed.sh')
| -rwxr-xr-x | t/t3405-rebase-malformed.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3405-rebase-malformed.sh b/t/t3405-rebase-malformed.sh index e4e2e649ed..e5ad67c643 100755 --- a/t/t3405-rebase-malformed.sh +++ b/t/t3405-rebase-malformed.sh @@ -41,8 +41,8 @@ test_expect_success rebase ' git rebase master side && git cat-file commit HEAD | sed -e "1,/^\$/d" >F1 && - diff -u F0 F1 && - diff -u F F0 + test_cmp F0 F1 && + test_cmp F F0 ' test_done |