From: Mark Andrews <marka@isc.org>
Date: Wed, 26 Oct 2016 13:09:21 +0000 (+1100)
Subject: change 4487 broke the cacheclean test with old version of perl. [RT #43476]
X-Git-Tag: v9.12.0a1~714
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=ecd8e95bb5a680c9c6421fffaf6dd61a7673a6cb;p=thirdparty%2Fbind9.git

change 4487 broke the cacheclean test with old version of perl. [RT #43476]
---

diff --git a/bin/tests/system/digcomp.pl b/bin/tests/system/digcomp.pl
index d43c8b2ea35..cf63c0e18a9 100644
--- a/bin/tests/system/digcomp.pl
+++ b/bin/tests/system/digcomp.pl
@@ -29,7 +29,8 @@ $rcode2 = "none";
 open(FILE1, $file1) || die("open: $file1: $!\n");
 while (<FILE1>) {
 	chomp;
-	~ s/\R//g;
+	~ s/\n//g;
+	~ s/\r\n//g;
 	if (/^;.+status:\s+(\S+).+$/) {
 		$rcode1 = $1;
 	}
@@ -65,7 +66,8 @@ $printed = 0;
 open(FILE2, $file2) || die("open: $file2: $!\n");
 while (<FILE2>) {
 	chomp;
-	~ s/\R//g;
+	~ s/\n//g;
+	~ s/\r\n//g;
 	if (/^;.+status:\s+(\S+).+$/) {
 		$rcode2 = $1;
 	}