From 57a35fddbf204bbc24a2f615958a1270c248a56b Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Wed, 4 Sep 2013 17:53:30 +0200 Subject: [PATCH] t0061: Work around a line endings issue with newer versions of cat on MSYS While msysgit uses cat 2.0, mingwGitDevEnv uses cat 5.97, currently. A change part of the latter version [1] makes cat use the "same rules as other programs to decide whether to use binary I/O". As a result, cat 5.97 behaves like e.g. awk with respect to which line endings are used if stdout is redirected to a file, and those are DOS line endings. Ignore line endings when comparing the test result to work around this. [1] http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=commit;h=8770c00ef45e3c6c4dd3d5ce1e55a6fb1adb13dc Signed-off-by: Thomas Braun Signed-off-by: Sebastian Schuberth --- t/t0061-run-command.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh index 17e969df60..3982bbf9db 100755 --- a/t/t0061-run-command.sh +++ b/t/t0061-run-command.sh @@ -22,7 +22,7 @@ test_expect_success 'run_command can run a command' ' chmod +x hello.sh && test-run-command run-command ./hello.sh >actual 2>err && - test_cmp hello-script actual && + test_cmp_text hello-script actual && test_cmp empty err '