development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

MinGW: update tests to handle a native eol of crlf

Browse source 
Some of the tests were written with the assumption that the native
eol would always be lf. After defining NATIVE_CRLF on MinGW, these
tests began failing.  This change will update the tests to also
handle a native eol of crlf.

Signed-off-by: Brice Lambson <bricelam@live.com>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brice Lambson 2014-08-30 23:39:07 +02:00 committed by Junio C Hamano
parent 5491e9e29e
commit 5f4e02e517
2 changed files with 35 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
t/t6038-merge-text-auto.sh
View file

@ -72,6 +72,10 @@ test_expect_success 'Merge after setting text=auto' '
same line same line
EOF EOF
if test_have_prereq NATIVE_CRLF; then
append_cr <expected >expected.temp &&
mv expected.temp expected
fi &&
git config merge.renormalize true && git config merge.renormalize true &&
git rm -fr . && git rm -fr . &&
rm -f .gitattributes && rm -f .gitattributes &&
@ -86,6 +90,10 @@ test_expect_success 'Merge addition of text=auto' '
same line same line
EOF EOF
if test_have_prereq NATIVE_CRLF; then
append_cr <expected >expected.temp &&
mv expected.temp expected
fi &&
git config merge.renormalize true && git config merge.renormalize true &&
git rm -fr . && git rm -fr . &&
rm -f .gitattributes && rm -f .gitattributes &&
@ -95,16 +103,19 @@ test_expect_success 'Merge addition of text=auto' '
' '
test_expect_success 'Detect CRLF/LF conflict after setting text=auto' ' test_expect_success 'Detect CRLF/LF conflict after setting text=auto' '
q_to_cr <<-\EOF >expected && echo "<<<<<<<" >expected &&
<<<<<<< if test_have_prereq NATIVE_CRLF; then
first line echo first line | append_cr >>expected &&
same line echo same line | append_cr >>expected &&
======= echo ======= | append_cr >>expected
first lineQ else
same lineQ echo first line >>expected &&
>>>>>>> echo same line >>expected &&
EOF echo ======= >>expected
fi &&
echo first line | append_cr >>expected &&
echo same line | append_cr >>expected &&
echo ">>>>>>>" >>expected &&
git config merge.renormalize false && git config merge.renormalize false &&
rm -f .gitattributes && rm -f .gitattributes &&
git reset --hard a && git reset --hard a &&
@ -114,16 +125,19 @@ test_expect_success 'Detect CRLF/LF conflict after setting text=auto' '
' '
test_expect_success 'Detect LF/CRLF conflict from addition of text=auto' ' test_expect_success 'Detect LF/CRLF conflict from addition of text=auto' '
q_to_cr <<-\EOF >expected && echo "<<<<<<<" >expected &&
<<<<<<< echo first line | append_cr >>expected &&
first lineQ echo same line | append_cr >>expected &&
same lineQ if test_have_prereq NATIVE_CRLF; then
======= echo ======= | append_cr >>expected &&
first line echo first line | append_cr >>expected &&
same line echo same line | append_cr >>expected
>>>>>>> else
EOF echo ======= >>expected &&
echo first line >>expected &&
echo same line >>expected
fi &&
echo ">>>>>>>" >>expected &&
git config merge.renormalize false && git config merge.renormalize false &&
rm -f .gitattributes && rm -f .gitattributes &&
git reset --hard b && git reset --hard b &&

1
t/test-lib.sh
View file

@ -867,6 +867,7 @@ case $(uname -s) in
# exec does not inherit the PID # exec does not inherit the PID
test_set_prereq MINGW test_set_prereq MINGW
test_set_prereq NOT_CYGWIN test_set_prereq NOT_CYGWIN
test_set_prereq NATIVE_CRLF
test_set_prereq SED_STRIPS_CR test_set_prereq SED_STRIPS_CR
test_set_prereq GREP_STRIPS_CR test_set_prereq GREP_STRIPS_CR
GIT_TEST_CMP=mingw_test_cmp GIT_TEST_CMP=mingw_test_cmp