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.

(cherry picked from commit 075613aea4758ff0e7c2a0666fa493631c5e1371)

diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh
index badd560238ccbc257782e4e31f42375eda52d3e8..761cf8e267e22bad3adbf2352a033ea5e1eb1920 100644 (file)
--- 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() (