From ecd8e95bb5a680c9c6421fffaf6dd61a7673a6cb Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 27 Oct 2016 00:09:21 +1100 Subject: [PATCH] change 4487 broke the cacheclean test with old version of perl. [RT #43476] --- bin/tests/system/digcomp.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/tests/system/digcomp.pl b/bin/tests/system/digcomp.pl index d43c8b2ea3..cf63c0e18a 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 () { 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 () { chomp; - ~ s/\R//g; + ~ s/\n//g; + ~ s/\r\n//g; if (/^;.+status:\s+(\S+).+$/) { $rcode2 = $1; }