X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d6e20136b71dc5f3cd333a6342223f814ec2e7a2..c47288eb9c3656ea36f3dd121cfd486fc03d5681:/test/runtest

diff --git a/test/runtest b/test/runtest
index 1d7589a69..0c9f2808b 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1160,11 +1160,11 @@ RESET_AFTER_EXTRA_LINE_READ:
 		(?: .*\sBerkeley\ DB
 		  | \sProbably\ (?:Berkeley\ DB|ndbm|GDBM)
 		  | \sUsing\ (?:tdb|sqlite3)
-		  | Authenticators:
+		  | Authenticators\ \((?:built-in|dynamic)\):
 		  | Lookups(?:\(built-in\))?:
 		  | Support\ for:
 		  | Routers\ \((?:built-in|dynamic)\):
-		  | Transports:
+		  | Transports\ \((?:built-in|dynamic)\):
 		  | Malware:
 		  | log\ selectors\ =
 		  | cwd=
@@ -1298,11 +1298,15 @@ RESET_AFTER_EXTRA_LINE_READ:
 
     # drop lookups
     next if /^$time_pid?(?: Lookups\ \((?:built-in|dynamic)\):
-					|Loaded\ "[^.]+\.so"\ \(\d+\ lookup\ types\)
+					| Loaded\ "[^.]+\.so"\ \(\d+\ lookup\ types\)
 					| Loading\ lookup\ modules\ from
 					| Loaded\ \d+\ lookup\ modules
 					| Total\ \d+\ lookups)/x;
 
+    # drop loads of dyn-module drivers
+    next if /^$time_pid?(?:Loading\ \w+\ (?:router|transport|auth)\ driver\ from
+			  | Loaded\ \w+\ (?:router|transport|auth)$)/x;
+
     # drop compiler information
     next if /^$time_pid?Compiler:/;
 
@@ -3737,12 +3741,13 @@ while (<EXIMINFO>)
     @parm_lookups{keys %temp_lookups} = values %temp_lookups;
     }
 
-  elsif (/^Authenticators: (.*)/)
+  elsif (/^Authenticators \((?:built-in|dynamic)\):  ?(.*)/)
     {
     print;
     @temp = split /(\s+)/, $1;
     push(@temp, ' ');
-    %parm_authenticators = @temp;
+    my %temp_auths= @temp;
+    @parm_authenticators{keys %temp_auths} = values %temp_auths;
     }
 
   elsif (/^Routers \((?:built-in|dynamic)\):  ?(.*)/)
@@ -3750,7 +3755,7 @@ while (<EXIMINFO>)
     print;
     @temp = split /(\s+)/, $1;
     push(@temp, ' ');
-    my %temp_routers= @temp;
+    my %temp_routers = @temp;
     @parm_routers{keys %temp_routers} = values %temp_routers;
     }
 
@@ -3758,13 +3763,15 @@ while (<EXIMINFO>)
   # that the basic transport name is set, and then the name with each of the
   # options.
 
-  elsif (/^Transports: (.*)/)
+  elsif (/^Transports \((?:built-in|dynamic)\): (.*)/)
     {
     print;
     @temp = split /(\s+)/, $1;
     my($i,$k);
     push(@temp, ' ');
-    %parm_transports = @temp;
+    my %temp_transports = @temp;
+    @parm_transports{keys %temp_transports} = values %temp_transports;
+
     foreach $k (keys %parm_transports)
       {
       if ($k =~ "/")