1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-28 09:16:10 +02:00

t5516: Use test_cmp when appropriate

Consistently using test_cmp would make debugging test scripts far easier,
as output from them run under "-v" option becomes readable.

Besides, some platforms' "diff" implementations lack "-q" option.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2010-03-11 21:51:57 -08:00
parent fbe4f447ec
commit c296134d03

View File

@ -672,7 +672,7 @@ test_expect_success 'push --porcelain' '
test "z$r" = "z$the_commit" &&
test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
) &&
diff -q .git/foo .git/bar
test_cmp .git/foo .git/bar
'
test_expect_success 'push --porcelain bad url' '
@ -692,7 +692,7 @@ test_expect_success 'push --porcelain rejected' '
echo >>.git/foo "! refs/heads/master:refs/heads/master [remote rejected] (branch is currently checked out)" &&
test_must_fail git push >.git/bar --porcelain testrepo refs/heads/master:refs/heads/master &&
diff -q .git/foo .git/bar
test_cmp .git/foo .git/bar
'
test_expect_success 'push --porcelain --dry-run rejected' '
@ -707,7 +707,7 @@ test_expect_success 'push --porcelain --dry-run rejected' '
echo >>.git/foo "Done" &&
test_must_fail git push >.git/bar --porcelain --dry-run testrepo refs/heads/master^:refs/heads/master &&
diff -q .git/foo .git/bar
test_cmp .git/foo .git/bar
'
test_done