tidying

[users/heiko/exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index afaaee3b21e01d54ade86c90a21cb1bd2faee161..b601e01cbb29ce9cf9d55499a516a3a7fa9a99ba 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1046,11 +1046,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     s/^((?:spool|log) directory space =) -?\d+K (inodes =)\s*-?\d+/$1 nnnnnK $2 nnnnn/;
 
     # Not all platforms support TCP Fast Open, and the compile omits the check
-    if (/^((>>> )?Connecting to .* )in hosts_try_fastopen\? no \(option unset\)$/)
+    if (s/\S+ in hosts_try_fastopen\? no \(option unset\)\n$//)
       {
-      my $p = $1;
-      $_ = <IN>;
-      s/^/$p/;
+      $_ .= <IN>
       }
 
     # When Exim is checking the size of directories for maildir, it uses
@@ -3147,8 +3145,15 @@ if ($parm_ipv6 =~ /^[\da-f]/)
 
 chomp($temp = `hostname`);
 die "'hostname' didn't return anything\n" unless defined $temp and length $temp;
-$parm_hostname = (gethostbyname($temp))[0];
-$parm_hostname = "no.host.name.found" unless defined $parm_hostname and length $parm_hostname;
+if ($temp =~ /\./)
+  {
+  $parm_hostname = $temp;
+  }
+else
+  {
+  $parm_hostname = (gethostbyname($temp))[0];
+  $parm_hostname = "no.host.name.found" unless defined $parm_hostname and length $parm_hostname;
+  }
 print "Hostname is $parm_hostname\n";
 
 if ($parm_hostname !~ /\./)