From 1e6faf3f28f4501ab82ade571c4112c89c404d78 Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Tue, 15 Sep 2020 10:01:07 +0200 Subject: [PATCH] test: ignore \r when diffing --- tests/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/common.sh b/tests/common.sh index 1025840c27..efc8d5e2cb 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -45,7 +45,7 @@ function exec_check { function diff_produced { if test -f "$f.expected.out"; then - if $DIFF -au -I "executing external script" "$f.expected.out" "$f.produced.out"; then + if $DIFF -au --strip-trailing-cr -I "executing external script" "$f.expected.out" "$f.produced.out"; then exit 0 else echo "ERROR: file $f.produced.out does not match $f.expected.out"