From: Michał Kępień <michal@isc.org>
Date: Wed, 11 Dec 2019 08:42:09 +0000 (+0100)
Subject: Fix the "forward" system test on Windows
X-Git-Tag: v9.14.10~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12f0f68742a03ccc71304f5157adf155454a70f0;p=thirdparty%2Fbind9.git

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 abb91c3c865..d76cd592173 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() (