From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 21 May 2024 11:35:04 +0000 (+0100)
Subject: Testsuite: perl version oddity
X-Git-Tag: exim-4.98-RC0~12
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/af8a610f0b90ae66f32b7c6ec31381bdd8457b59

Testsuite: perl version oddity

Obsoletes: fd0a407eb801
Broken-by: 235ef8b38301
---

diff --git a/test/runtest b/test/runtest
index f626cb4ee..3fe7fe044 100755
--- a/test/runtest
+++ b/test/runtest
@@ -120,7 +120,7 @@ my $parm_hostname;
 my $re_ipv4 = qr/\d{1,3}(?:\.\d{1,3}){3}/;
 my $re_6g = qr/[[:xdigit:]]{1,4}/;
 my $re_6s = qr/${re_6g}:/;
-my $re_ipv6 = qr/(?:${re_6s}){,7}${re_6g}(?:::(?:${re_6s}){,5}${re_6g})?/;
+my $re_ipv6 = qr/${re_6s}{,7}${re_6g}(?:::${re_6s}{,5}${re_6g})?/;
 my $re_ip = qr/(?:${re_ipv4}|${re_ipv6})/;
 
 ###############################################################################
@@ -3362,7 +3362,7 @@ if (defined $parm_lookups{redis})
 
 sub check_running_dovecot
 {
-system('dovecot --version >/dev/null');
+system('dovecot --version >/dev/null 2>&1');
 if ($? == 0)
   {
   print "Dovecot appears to be available\n";