threads / patch / 26066

patch, 14 partst3032-*.sh: Do not strip CR from line-endings while grepping on MinGW

Subject: [PATCH 12/14] t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW

## tl;dr

2 messages between Dec 14, 2010 and Dec 14, 2010. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Ramsay Jones· Dec 14, 2010, 18:35 UTC · lore

By default grep reads in text mode and converts CRLF into LF line endings, which causes tests 4, 6 and 8 to fail. In a similar manner to commit a94114ad (Do not strip CR when grepping HTTP headers, 2010-09-12), we set (and export) the GREP_OPTIONS variable to -U so that grep will use binary mode.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---
 t/t3032-merge-recursive-options.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Show changes to t/t3032-merge-recursive-options.sh +1 −0
diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index f70f6c4..29e049a 100755
--- a/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@ -14,6 +14,7 @@ test_description='merge-recursive options
 . ./test-lib.sh
 
 test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
+test_have_prereq MINGW && export GREP_OPTIONS=-U
 
 test_expect_success 'setup' '
 	conflict_hunks () {

-- 
1.7.3
Junio C Hamano· Dec 14, 2010, 19:44 UTC · re: Ramsay Jones · lore

Re: [PATCH 12/14] t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW

Ramsay Jones <ramsay@ramsay1.demon.co.uk> writes:
Show 7 quoted lines
> By default grep reads in text mode and converts CRLF into LF line
> endings, which causes tests 4, 6 and 8 to fail. In a similar manner
> to commit a94114ad  (Do not strip CR when grepping HTTP headers,
> 2010-09-12), we set (and export) the GREP_OPTIONS variable to -U so
> that grep will use binary mode.
>
> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>

Adding these GNU specific options leaves a bad aftertaste in my mouth, but I'd pass them, as their use is limited to certain platforms with "prereq".

Thanks.

← back to recent threads