MinGW: update tests to handle a native eol of crlf

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>

diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh
index d9c2d386ddf8caff4b87fa457c23757f76c293c7..85c10b0940a896bb49aefee9a2885b1c39217bab 100755 (executable)
--- a/t/t6038-merge-text-auto.sh
+++ b/t/t6038-merge-text-auto.sh
@@ -72,6 +72,10 @@ test_expect_success 'Merge after setting text=auto' '
        same line
        EOF
 
        same line
        EOF
 

+       if test_have_prereq NATIVE_CRLF; then
+               append_cr <expected >expected.temp &&
+               mv expected.temp expected
+       fi &&

        git config merge.renormalize true &&
        git rm -fr . &&
        rm -f .gitattributes &&
        git config merge.renormalize true &&
        git rm -fr . &&
        rm -f .gitattributes &&


@@ -86,6 +90,10 @@ test_expect_success 'Merge addition of text=auto' '
        same line
        EOF
 
        same line
        EOF
 

+       if test_have_prereq NATIVE_CRLF; then
+               append_cr <expected >expected.temp &&
+               mv expected.temp expected
+       fi &&

        git config merge.renormalize true &&
        git rm -fr . &&
        rm -f .gitattributes &&
        git config merge.renormalize true &&
        git rm -fr . &&
        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 &&
-       <<<<<<<
-       first line
-       same line
-       =======
-       first lineQ
-       same lineQ
-       >>>>>>>
-       EOF
-
+       echo "<<<<<<<" >expected &&
+       if test_have_prereq NATIVE_CRLF; then
+               echo first line | append_cr >>expected &&
+               echo same line | append_cr >>expected &&
+               echo ======= | append_cr >>expected
+       else
+               echo first line >>expected &&
+               echo same line >>expected &&
+               echo ======= >>expected
+       fi &&
+       echo first line | append_cr >>expected &&
+       echo same line | append_cr >>expected &&
+       echo ">>>>>>>" >>expected &&

        git config merge.renormalize false &&
        rm -f .gitattributes &&
        git reset --hard a &&
        git config merge.renormalize false &&
        rm -f .gitattributes &&
        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 &&
-       <<<<<<<
-       first lineQ
-       same lineQ
-       =======
-       first line
-       same line
-       >>>>>>>
-       EOF
-
+       echo "<<<<<<<" >expected &&
+       echo first line | append_cr >>expected &&
+       echo same line | append_cr >>expected &&
+       if test_have_prereq NATIVE_CRLF; then
+               echo ======= | append_cr >>expected &&
+               echo first line | append_cr >>expected &&
+               echo same line | append_cr >>expected
+       else
+               echo ======= >>expected &&
+               echo first line >>expected &&
+               echo same line >>expected
+       fi &&
+       echo ">>>>>>>" >>expected &&

        git config merge.renormalize false &&
        rm -f .gitattributes &&
        git reset --hard b &&
        git config merge.renormalize false &&
        rm -f .gitattributes &&
        git reset --hard b &&

diff --git a/t/test-lib.sh b/t/test-lib.sh
index a4795373a6a2e1f247b3cef9880f2a82309b3594..f359731c87055c9e56547ced99d0d6814b77821e 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -867,6 +867,7 @@ case $(uname -s) in
        # exec does not inherit the PID
        test_set_prereq MINGW
        test_set_prereq NOT_CYGWIN
        # exec does not inherit the PID
        test_set_prereq MINGW
        test_set_prereq NOT_CYGWIN

+       test_set_prereq NATIVE_CRLF

        test_set_prereq SED_STRIPS_CR
        test_set_prereq GREP_STRIPS_CR
        GIT_TEST_CMP=mingw_test_cmp
        test_set_prereq SED_STRIPS_CR
        test_set_prereq GREP_STRIPS_CR
        GIT_TEST_CMP=mingw_test_cmp