Lookups: sub-path for dsearch

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index f626cb4ee16c6793c46d5fbc195b6adf4e31b3b2..3fe7fe0440116f7e257162691eb63e89fb84e69f 100755 (executable)
--- 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_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})/;
 
 ###############################################################################
 my $re_ip = qr/(?:${re_ipv4}|${re_ipv6})/;
 
 ###############################################################################


@@ -3362,7 +3362,7 @@ if (defined $parm_lookups{redis})
 
 sub check_running_dovecot
 {
 
 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";
 if ($? == 0)
   {
   print "Dovecot appears to be available\n";