* [PATCH v3 2/2] MinGW: Update tests to handle a native eol of crlf
@ 2014-08-30 21:39 Torsten Bögershausen
2014-09-02 19:10 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Torsten Bögershausen @ 2014-08-30 21:39 UTC (permalink / raw)
To: git; +Cc: tboegi
Integrate commit b1d07649588102 from msysgit:
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>
On top of that, fix the broken && chain in t0026
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
---
t/t0026-eol-config.sh | 6 +++---
t/t6038-merge-text-auto.sh | 54 +++++++++++++++++++++++++++++-----------------
t/test-lib.sh | 1 +
3 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh
index 43a580a..4806969 100755
--- a/t/t0026-eol-config.sh
+++ b/t/t0026-eol-config.sh
@@ -84,9 +84,9 @@ test_expect_success NATIVE_CRLF 'eol native is crlf' '
rm -rf native_eol && mkdir native_eol &&
( cd native_eol &&
- printf "*.txt text\n" > .gitattributes
- printf "one\r\ntwo\r\nthree\r\n" > filedos.txt
- printf "one\ntwo\nthree\n" > fileunix.txt
+ printf "*.txt text\n" > .gitattributes &&
+ printf "one\r\ntwo\r\nthree\r\n" > filedos.txt &&
+ printf "one\ntwo\nthree\n" > fileunix.txt &&
git init &&
git config core.autocrlf false &&
git config core.eol native &&
diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh
index d9c2d38..85c10b0 100755
--- 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
+ 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 &&
@@ -86,6 +90,10 @@ test_expect_success 'Merge addition of text=auto' '
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 &&
@@ -95,16 +103,19 @@ test_expect_success 'Merge addition of 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 &&
@@ -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' '
- 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 &&
diff --git a/t/test-lib.sh b/t/test-lib.sh
index b1bc65b..aceb418 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -871,6 +871,7 @@ case $(uname -s) in
# 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
--
2.1.0.rc2.210.g636bceb
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v3 2/2] MinGW: Update tests to handle a native eol of crlf
2014-08-30 21:39 [PATCH v3 2/2] MinGW: Update tests to handle a native eol of crlf Torsten Bögershausen
@ 2014-09-02 19:10 ` Junio C Hamano
2014-09-02 19:53 ` Torsten Bögershausen
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2014-09-02 19:10 UTC (permalink / raw)
To: Torsten Bögershausen; +Cc: git
Torsten Bögershausen <tboegi@web.de> writes:
> Integrate commit b1d07649588102 from msysgit:
> 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>
>
> On top of that, fix the broken && chain in t0026
>
> Helped-by: Eric Sunshine <sunshine@sunshineco.com>
> Signed-off-by: Torsten Bögershausen <tboegi@web.de>
> ---
Should this be marked with "From: Brice Lambson <bricelam@live.com>"?
Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3 2/2] MinGW: Update tests to handle a native eol of crlf
2014-09-02 19:10 ` Junio C Hamano
@ 2014-09-02 19:53 ` Torsten Bögershausen
2014-09-02 20:49 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Torsten Bögershausen @ 2014-09-02 19:53 UTC (permalink / raw)
To: Junio C Hamano, Torsten Bögershausen; +Cc: git
On 2014-09-02 21.10, Junio C Hamano wrote:
> Torsten Bögershausen <tboegi@web.de> writes:
>
>> Integrate commit b1d07649588102 from msysgit:
>> 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>
>>
>> On top of that, fix the broken && chain in t0026
>>
>> Helped-by: Eric Sunshine <sunshine@sunshineco.com>
>> Signed-off-by: Torsten Bögershausen <tboegi@web.de>
>> ---
>
> Should this be marked with "From: Brice Lambson <bricelam@live.com>"?
>
> Thanks.
Yes. If possible please squeeze.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3 2/2] MinGW: Update tests to handle a native eol of crlf
2014-09-02 19:53 ` Torsten Bögershausen
@ 2014-09-02 20:49 ` Junio C Hamano
2014-09-03 18:19 ` Torsten Bögershausen
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2014-09-02 20:49 UTC (permalink / raw)
To: Torsten Bögershausen; +Cc: git
Torsten Bögershausen <tboegi@web.de> writes:
>> Should this be marked with "From: Brice Lambson <bricelam@live.com>"?
>>
>> Thanks.
> Yes. If possible please squeeze.
OK, thanks. Please double check the result on 'pu' in several
hours.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3 2/2] MinGW: Update tests to handle a native eol of crlf
2014-09-02 20:49 ` Junio C Hamano
@ 2014-09-03 18:19 ` Torsten Bögershausen
0 siblings, 0 replies; 5+ messages in thread
From: Torsten Bögershausen @ 2014-09-03 18:19 UTC (permalink / raw)
To: Junio C Hamano, Torsten Bögershausen; +Cc: git
On 2014-09-02 22.49, Junio C Hamano wrote:
> Torsten Bögershausen <tboegi@web.de> writes:
>
>>> Should this be marked with "From: Brice Lambson <bricelam@live.com>"?
>>>
>>> Thanks.
>> Yes. If possible please squeeze.
>
> OK, thanks. Please double check the result on 'pu' in several
> hours.
Excellent
t0027 and t0026 passed under Cygwin, MysGit and Mac OS.
(after reverting "use timer_settime() for new platforms", but that is a different story)
Many thanks for helping me out and bringing this forward.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-03 18:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-30 21:39 [PATCH v3 2/2] MinGW: Update tests to handle a native eol of crlf Torsten Bögershausen
2014-09-02 19:10 ` Junio C Hamano
2014-09-02 19:53 ` Torsten Bögershausen
2014-09-02 20:49 ` Junio C Hamano
2014-09-03 18:19 ` Torsten Bögershausen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.