]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Fix the "forward" system test on Windows
authorMichał Kępień <michal@isc.org>
Wed, 11 Dec 2019 08:42:09 +0000 (09:42 +0100)
committerMichał Kępień <michal@isc.org>
Wed, 11 Dec 2019 08:44:20 +0000 (09:44 +0100)
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

index abb91c3c865b48ec62bf3f9b0b09d37e21f9b5d2..d76cd592173f35774f17c4da9350da6781183b35 100644 (file)
@@ -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() (