From 807b3edf8af819255b4bf449101b983242c18536 Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Fri, 31 May 2013 10:58:25 +0100 Subject: [PATCH] t7800: a few tests should ignore crlf in checking the result. Those tests that generate files using echo can expect crlf issues when run under windows. For such cases we use 'test_cmp_text'. Signed-off-by: Pat Thoyts --- t/t7800-difftool.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index d46f0411bd..a1e65d6b3c 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -253,7 +253,7 @@ test_expect_success PERL 'difftool --extcmd echo arg1' ' echo file >expect && git difftool --no-prompt \ --extcmd sh\ -c\ \"echo\ \$1\" branch >actual && - test_cmp expect actual + test_cmp_text expect actual ' test_expect_success PERL 'difftool --extcmd cat arg1' ' @@ -393,7 +393,7 @@ test_expect_success PERL 'difftool --no-symlinks does not overwrite working tree echo "orig content" >file && git difftool --dir-diff --no-symlinks --extcmd "$(pwd)/modify-file" branch && echo "new content" >expect && - test_cmp expect file + test_cmp_text expect file ' write_script modify-both-files <<\EOF @@ -409,9 +409,9 @@ test_expect_success PERL 'difftool --no-symlinks detects conflict ' ' echo "orig content" >file && test_must_fail git difftool --dir-diff --no-symlinks --extcmd "$(pwd)/modify-both-files" branch && echo "wt content" >expect && - test_cmp expect file && + test_cmp_text expect file && echo "tmp content" >expect && - test_cmp expect "$(cat tmpdir)/file" + test_cmp_text expect "$(cat tmpdir)/file" ) '