Testsuite: avoid IPv6 interfaces to avoid extra debug stderr lines

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 70f1d9b4b6eaacf7cf95edd74c9e160c3b148d6d..616ded37cc4a96f83f8fd5cd761664cdbb118dd8 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -83,6 +83,10 @@ $parm_port_d4 = 1228;        # Additional for daemon
 # Manually set locale
 $ENV{'LC_ALL'} = 'C';
 
+# In some environments USER does not exists, but we
+# need it for some test(s)
+$ENV{USER} = getpwuid($>)
+  if not exists $ENV{USER};
 
 
 ###############################################################################
@@ -1371,6 +1375,9 @@ $munges =
     'delay_1500' =>
     { 'stderr' => 's/(1[5-9]|23\d)\d\d msec/ssss msec/' },
 
+    'tls_anycipher' =>
+    { 'mainlog' => 's/ X=TLS\S+ / X=TLS_proto_and_cipher /' },
+
   };
 
 
@@ -2904,7 +2911,7 @@ while (($parm_ipv4 eq "" || $parm_ipv6 eq "") && ($_ = <IFCONFIG>))
       $_ =~ /^\s*inet(?:\saddr)?:?\s?(\d+\.\d+\.\d+\.\d+)\s/i)
     {
     $ip = $1;
-    next if ($ip =~ /^127\./);
+    next if ($ip =~ /^127\./ || $ip =~ /^10\./);
     $parm_ipv4 = $ip;
     }