From: Michał Kępień <michal@isc.org>
Date: Fri, 19 Apr 2019 09:21:43 +0000 (+0200)
Subject: Fix the "dnssec" system test on Windows
X-Git-Tag: v9.15.0~37^2~1
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=e4280ed9f561bc22e5c4f7817536d344598fcf3a;p=thirdparty%2Fbind9.git

Fix the "dnssec" system test on Windows

On Windows, the bin/tests/system/dnssec/signer/example.db.signed file
contains carriage return characters at the end of each line.  Remove
them before passing the aforementioned file to the awk script extracting
key IDs so that the latter can work properly.
---

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 17b4ceb5ab1..74f137837ce 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -1461,6 +1461,7 @@ test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
 get_rsasha1_key_ids_from_sigs() {
+	tr -d '\r' < signer/example.db.signed | \
 	awk '
 		NF < 8 { next }
 		$(NF-5) != "RRSIG" { next }
@@ -1470,7 +1471,8 @@ get_rsasha1_key_ids_from_sigs() {
 			getline;
 			print $3;
 		}
-	' signer/example.db.signed | sort -u
+	' | \
+	sort -u
 }
 
 echo_i "checking that we can sign a zone with out-of-zone records ($n)"