From: Michał Kępień <michal@isc.org>
Date: Thu, 16 Jan 2020 08:48:01 +0000 (+0100)
Subject: Fix the "dnssec" system test on Windows
X-Git-Tag: v9.14.10~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfedaa5a994deaa65109c1e83916dec93863b89e;p=thirdparty%2Fbind9.git

Fix the "dnssec" system test on Windows

Make sure carriage return characters are stripped from awk input to
enable the "dnssec" system test to pass on Windows.

(cherry picked from commit 451484b8703d7bd34dea2a52a90b8f1dfa4cc1bd)
---

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 26cbe696b1c..b9493b9f277 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -120,11 +120,12 @@ stripns () {
 # Ensure there is not a blank line before "Secure roots:".
 #
 check_secroots_layout () {
+	tr -d '\r' < "$1" | \
 	awk '$0 == "" { if (empty) exit(1); empty=1; next }
 	     /Start view/ { if (!empty) exit(1) }
 	     /Secure roots:/ { if (empty) exit(1) }
 	     /Negative trust anchors:/ { if (!empty) exit(1) }
-	     { empty=0 }' $1
+	     { empty=0 }'
 	return $?
 }