]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
change 4487 broke the cacheclean test with old version of perl. [RT #43476]
authorMark Andrews <marka@isc.org>
Wed, 26 Oct 2016 13:09:21 +0000 (00:09 +1100)
committerMark Andrews <marka@isc.org>
Wed, 26 Oct 2016 13:09:21 +0000 (00:09 +1100)
bin/tests/system/digcomp.pl

index d43c8b2ea358eea621bc7a43e57de8531dd146f7..cf63c0e18a9f91f25226ef2688f61ae9c432b0b4 100644 (file)
@@ -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;
        }