From 075613aea4758ff0e7c2a0666fa493631c5e1371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Wed, 11 Dec 2019 09:42:09 +0100 Subject: [PATCH] Fix the "forward" system test on Windows Make sure carriage return characters are stripped from sed input to enable the "forward" system test to pass on Windows. --- bin/tests/system/forward/tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh index abb91c3c86..d76cd59217 100644 --- a/bin/tests/system/forward/tests.sh +++ b/bin/tests/system/forward/tests.sh @@ -161,7 +161,7 @@ count_sent() ( logfile="$1" start_pattern="$2" pattern="$3" - nextpartpeek "$logfile" | sed -n "/$start_pattern/,/^\$/p" | grep -c "$pattern" + nextpartpeek "$logfile" | tr -d '\r' | sed -n "/$start_pattern/,/^\$/p" | grep -c "$pattern" ) check_sent() (