manualroute as dynamic module

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index b89960a8bb867570b754016cf7b34fb32b46f814..0c9f2808b94432f4a3ab636107edf79236ceeb01 100755 (executable)
--- 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)
                (?: .*\sBerkeley\ DB
                  | \sProbably\ (?:Berkeley\ DB|ndbm|GDBM)
                  | \sUsing\ (?:tdb|sqlite3)

-                 | Authenticators:
+                 | Authenticators\ \((?:built-in|dynamic)\):

                  | Lookups(?:\(built-in\))?:
                  | Support\ for:
                  | Lookups(?:\(built-in\))?:
                  | Support\ for:

-                 | Routers:
-                 | Transports:
+                 | Routers\ \((?:built-in|dynamic)\):
+                 | Transports\ \((?:built-in|dynamic)\):

                  | Malware:
                  | log\ selectors\ =
                  | cwd=
                  | Malware:
                  | log\ selectors\ =
                  | cwd=


@@ -1298,11 +1298,15 @@ RESET_AFTER_EXTRA_LINE_READ:
 
     # drop lookups
     next if /^$time_pid?(?: Lookups\ \((?:built-in|dynamic)\):
 
     # 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;
 
                                        | 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:/;
 
     # drop compiler information
     next if /^$time_pid?Compiler:/;
 


@@ -3737,33 +3741,37 @@ while (<EXIMINFO>)
     @parm_lookups{keys %temp_lookups} = values %temp_lookups;
     }
 
     @parm_lookups{keys %temp_lookups} = values %temp_lookups;
     }
 

-  elsif (/^Authenticators: (.*)/)
+  elsif (/^Authenticators \((?:built-in|dynamic)\):  ?(.*)/)

     {
     print;
     @temp = split /(\s+)/, $1;
     push(@temp, ' ');
     {
     print;
     @temp = split /(\s+)/, $1;
     push(@temp, ' ');

-    %parm_authenticators = @temp;
+    my %temp_auths= @temp;
+    @parm_authenticators{keys %temp_auths} = values %temp_auths;

     }
 
     }
 

-  elsif (/^Routers: (.*)/)
+  elsif (/^Routers \((?:built-in|dynamic)\):  ?(.*)/)

     {
     print;
     @temp = split /(\s+)/, $1;
     push(@temp, ' ');
     {
     print;
     @temp = split /(\s+)/, $1;
     push(@temp, ' ');

-    %parm_routers = @temp;
+    my %temp_routers = @temp;
+    @parm_routers{keys %temp_routers} = values %temp_routers;

     }
 
   # Some transports have options, e.g. appendfile/maildir. For those, ensure
   # that the basic transport name is set, and then the name with each of the
   # options.
 
     }
 
   # Some transports have options, e.g. appendfile/maildir. For those, ensure
   # 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, ' ');
     {
     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 =~ "/")
     foreach $k (keys %parm_transports)
       {
       if ($k =~ "/")


@@ -4138,7 +4146,7 @@ system("sudo cp eximdir/exim eximdir/exim_exim;" .
 
 ($parm_exim_dir) = $parm_exim =~ m?^(.*)/exim?;
 
 
 ($parm_exim_dir) = $parm_exim =~ m?^(.*)/exim?;
 

-while (my $file = glob("$parm_exim_dir/lookups/*.so")) {
+while (my $file = glob("$parm_exim_dir/dynmodules/*.so")) {

   my $base = basename($file);
   cp("$file", "eximdir/");
   system("sudo chmod 755 eximdir/$base");
   my $base = basename($file);
   cp("$file", "eximdir/");
   system("sudo chmod 755 eximdir/$base");