X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/cfd47d9e77d3ec3cccbf9fb0ff6672c3b83b8fe3..cd6ab265aa53f6bc030e5dfaf113f45d182be40c:/test/runtest diff --git a/test/runtest b/test/runtest index e47a4d2a6..23551861a 100755 --- a/test/runtest +++ b/test/runtest @@ -254,9 +254,11 @@ die "** runtest error: $_[1]\n"; sub new_value { my($oldid, $base, $sequence) = @_; my($newid) = $cache{$oldid}; +print ">> replace $oldid -> $newid\n" if ($debug && defined $newid); if (! defined $newid) { $newid = sprintf($base, $$sequence++); + print ">> new $oldid -> $newid\n" if $debug; $cache{$oldid} = $newid; } return $newid; @@ -387,9 +389,11 @@ LINE: while() RESET_AFTER_EXTRA_LINE_READ: if ($munge_skip) { - # Munging is a no-op. + # Munging is a no-op, except for exim_msgdate specials. # Useful when testing exim_msgdate so that # we compare unmunged dates and message-ids. + s%^localhost \d+ from message-id != given number \d+ at \K/.+(?=/test/eximdir/exim_msgdate line 387.$)%DIR%; + print MUNGED; next; } @@ -421,9 +425,12 @@ RESET_AFTER_EXTRA_LINE_READ: # patchexim should have fixed this for us #s/Exim \K\d+[._]\d+[\w_-]*/x.yz/i; - # Replace Exim message ids by a unique series + # Replace Exim message ids by a unique series. + # Both old and new formats, with separate replace series, for now. s/(\d[^\W_]{5}-[^\W_]{6}-[^\W_]{2}) - /new_value($1, "10Hm%s-0005vi-00", \$next_msgid)/egx; + /new_value($1, "10Hm%s-0005vi-00", \$next_msgid_old)/egx; + s/(\d[^\W_]{5}-[^\W_]{11}-[^\W_]{4}) + /new_value($1, "10Hm%s-000000005vi-0000", \$next_msgid)/egx; # The names of lock files appear in some error and debug messages s/\.lock(\.[-\w]+)+(\.[\da-f]+){2}/.lock.test.ex.dddddddd.pppppppp/; @@ -758,6 +765,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/\bgid=\d+/gid=gggg/; s/\begid=\d+/egid=gggg/; s/\b(?:pid=|pid\s|PID:\s|Process\s|child\s)\K(\d+)/new_value($1, "p%s", \$next_pid)/gxe; + s/ Ci=\K(\d+)/new_value($1, "p%s", \$next_pid)/gxe; s/\buid=\d+/uid=uuuu/; s/\beuid=\d+/euid=uuuu/; s/set_process_info:\s+\d+/set_process_info: pppp/; @@ -884,7 +892,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/([\s,])S=\d+\b/$1S=sss/; s/:S\d+\b/:Ssss/; - s/^(\s*\d+m\s+)\d+(\s+[a-z0-9-]{16} <)/$1sss$2/i if $is_stdout; + s/^(\s*\d+[mhd]\s+)\d+(\s+(?:[a-z0-9-]{23}|[a-z0-9-]{18}) <)/TTT sss$2/i if $is_stdout; s/\sSIZE=\d+\b/ SIZE=ssss/; s/\ssize=\d+\b/ size=sss/ if $is_stderr; s/old size = \d+\b/old size = sssss/; @@ -1062,6 +1070,9 @@ RESET_AFTER_EXTRA_LINE_READ: # gsasl library version may not support some methods s/250-AUTH ANONYMOUS PLAIN SCRAM-SHA-1\K SCRAM-SHA-256//; + + # mailq times change with when the run is done, vs. static-source spoolfiles + s/\s*\d*[hd](?= 317 [0-9A-Za-z\-]{23} )/DDd/; } # ======== stderr ======== @@ -1546,7 +1557,7 @@ RESET_AFTER_EXTRA_LINE_READ: # OpenSSL version variances s/(TLS error on connection [^:]*: error:)[0-9A-F]{8}(:system library):(?:fopen|func\(4095\)|):(No such file or directory)$/$1xxxxxxxx$2:fopen:$3/; - next if /TLS error \(SSL_read\): error:0A000126:SSL routines::unexpected eof while reading$/ ; + next if /TLS error \(SSL_read\): .*error:0A000126:SSL routines::unexpected eof while reading$/ ; s/EVDATA: \K\(SSL_accept\): error:0A000126:SSL routines::unexpected eof while reading/SSL_accept: TCP connection closed by peer/; s/(DANE attempt failed.*error:)[0-9A-F]{8}(:SSL routines:)(?:(?i)ssl3_get_server_certificate|tls_process_server_certificate|CONNECT_CR_CERT|)(?=:certificate verify failed$)/$1xxxxxxxx$2ssl3_get_server_certificate/; s/(DKIM: validation error: )error:[0-9A-F]{8}:rsa routines:(?:(?i)int_rsa_verify|CRYPTO_internal):(?:bad signature|algorithm mismatch)$/$1Public key signature verification has failed./; @@ -1854,13 +1865,13 @@ if (-e $sf_current) for (my $i = 0; $i < @munged; $i++) { - if ($munged[$i] =~ /^[-\d]{10}\s[:\d]{8}\s[-A-Za-z\d]{16}\s[-=*]>/) + if ($munged[$i] =~ /^[-\d]{10}\s[:\d]{8}(\.\d{3})?\s[-A-Za-z\d]{23}\s[-=*]>/) { my $j; for ($j = $i + 1; $j < @munged; $j++) { last if $munged[$j] !~ - /^[-\d]{10}\s[:\d]{8}\s[-A-Za-z\d]{16}\s[-=*]>/; + /^[-\d]{10}\s[:\d]{8}(\.\d{3})?\s[-A-Za-z\d]{23}\s[-=*]>/; } @temp = splice(@munged, $i, $j - $i); @temp = sort(@temp); @@ -2193,9 +2204,15 @@ if (! $msglog_skip) foreach $msglog (@msglogs) { next if ($msglog eq "." || $msglog eq ".." || $msglog eq "CVS"); + ($munged_msglog = $msglog) =~ s/((?:[^\W_]{6}-){2}[^\W_]{2}) - /new_value($1, "10Hm%s-0005vi-00", \$next_msgid)/egx; + /new_value($1, "10Hm%s-0005vi-00", \$next_msgid_old)/egx; + + $munged_msglog =~ + s/([^\W_]{6}-[^\W_]{11}-[^\W_]{4}) + /new_value($1, "10Hm%s-000000005vi-0000", \$next_msgid)/egx; + $yield = max($yield, check_file("spool/msglog/$msglog", undef, "test-msglog-munged", "msglog/$testno.$munged_msglog", 0, $munge->{msglog})); @@ -2511,6 +2528,17 @@ if (/^eximstats\s+(.*)/) } +# The "exim_id_update" command runs exim_id_update on the current spool + +if (/^exim_id_update(\s+.*)?$/) + { + run_system("(sudo ./eximdir/exim_id_update" . ($1 || '') . " $parm_cwd/spool/input;" . + "echo exim_id_update exit code = \$?)" . + ">>test-stdout 2>>test-stderr"); + return 1; + } + + # The "gnutls" command makes a copy of saved GnuTLS parameter data in the # spool directory, to save Exim from re-creating it each time. @@ -2602,7 +2630,7 @@ if (/^sleep\s+(.*)$/) # Various Unix management commands are recognized if (/^(ln|ls|du|mkdir|mkfifo|touch|cp|cat)\s/ || - /^sudo\s(rmdir|rm|mv|chown|chmod)\s/) + /^sudo\s(mkdir|rmdir|rm|mv|cp|chown|chmod)\s/) { run_system("$_ >>test-stdout 2>>test-stderr"); return 1; @@ -2731,6 +2759,10 @@ if (/^(cat)?write\s+(\S+)(?:\s+(.*))?\s*$/) if (/^client/ || /^(sudo\s+)?perl\b/) { + if (defined($tls)) { + s/^client-anytls/client-ssl/ if ($tls eq 'openssl'); + s/^client-anytls/client-gnutls/ if ($tls eq 'gnutls'); + } s"client"./bin/client"; $cmd = "$_ >>test-stdout 2>>test-stderr"; } @@ -2784,15 +2816,15 @@ elsif (/^((?i:[A-Z\d_]+=\S+\s+)+)?(\d+)?\s*(sudo(?:\s+-u\s+(\w+))?\s+)?exim(_\S+ if (defined $queuespec) { - @listcmd = ("$parm_cwd/eximdir/exim", '-bp', + @listcmd = ("$parm_cwd/$exim_server", '-bp', $queuespec, - "-DEXIM_PATH=$parm_cwd/eximdir/exim", + "-DEXIM_PATH=$parm_cwd$exim_server", -C => "$parm_cwd/test-config"); } else { - @listcmd = ("$parm_cwd/eximdir/exim", '-bp', - "-DEXIM_PATH=$parm_cwd/eximdir/exim", + @listcmd = ("$parm_cwd/$exim_server", '-bp', + "-DEXIM_PATH=$parm_cwd/$exim_server", -C => "$parm_cwd/test-config"); } print ">> Getting queue list from:\n>> @listcmd\n" if $debug; @@ -2824,11 +2856,24 @@ elsif (/^((?i:[A-Z\d_]+=\S+\s+)+)?(\d+)?\s*(sudo(?:\s+-u\s+(\w+))?\s+)?exim(_\S+ my $opt_valgrind = $valgrind ? "valgrind --leak-check=yes --suppressions=$parm_cwd/aux-fixed/valgrind.supp " : ''; - $cmd = "$envset$sudo$opt_valgrind" . - "$parm_cwd/eximdir/exim$special$optargs " . - "-DEXIM_PATH=$parm_cwd/eximdir/exim$special " . - "-C $parm_cwd/test-config $args " . + $cmd = "$envset$sudo$opt_valgrind"; + + if ($special ne '') { + $cmd .= "$parm_cwd/eximdir/exim$special$optargs " . + "-DEXIM_PATH=$parm_cwd/eximdir/exim$special "; + } + elsif ($args =~ /(^|\s)-DSERVER=server\s/) { + $cmd .= "$parm_cwd/$exim_server$optargs " . + "-DEXIM_PATH=$parm_cwd/$exim_server "; + } + else { + $cmd .= "$parm_cwd/$exim_client$optargs " . + "-DEXIM_PATH=$parm_cwd/$exim_client "; + } + + $cmd .= "-C $parm_cwd/test-config $args " . ">>test-stdout 2>>test-stderr"; + # If the command is starting an Exim daemon, we run it in the same # way as the "server" command above, that is, we don't want to wait # for the process to finish. That happens when "killdaemon" is obeyed later @@ -3307,6 +3352,7 @@ GetOptions( 'ipv6!' => \$have_ipv6, 'keep' => \$save_output, 'slow' => \$slow, + 'tls=s' => \my $tls, 'valgrind' => \$valgrind, 'range=s{2}' => \my @range_wanted, 'test=i@' => \my @tests_wanted, @@ -3884,6 +3930,45 @@ else die "** Unable to make patched exim: $!\n" if (system("sudo ./patchexim $parm_exim") != 0); +# If TLS-library-specific binaries have been made, grab them too + +$suff = 'openssl'; +$f = $parm_exim . '_' . $suff; +if (-f $f) { + $exim_openssl = "eximdir/exim_$suff"; + die "** Unable to make patched exim: $!\n" + if (system("sudo ./patchexim -o $exim_openssl $f") != 0); + } +$suff = 'gnutls'; +$f = $parm_exim . '_' . $suff; +if (-f $f) { + $exim_gnutls = "eximdir/exim_$suff"; + die "** Unable to make patched exim: $!\n" + if (system("sudo ./patchexim -o $exim_gnutls $f") != 0); + } + +if (defined($tls)) + { + die "** Need both $exim_openssl and $exim_gnutls for cross-library teting\n" + if ( !defined($exim_openssl) || !defined($exim_gnutls) ); + if ($tls eq 'openssl') + { + $exim_client = $exim_openssl; + $exim_server = $exim_gnutls; + } + elsif ($tls eq 'gnutls') + { + $exim_client = $exim_gnutls; + $exim_server = $exim_openssl; + } + else + { die "** need eother openssl or gnutls speified as the client for cross-library testing, saw $tls\n"; } + } +else + { $exim_client = $exim_server = 'eximdir/exim'; } +print ">> \$exim_client <$exim_client>\n";; +print ">> \$exim_server <$exim_server>\n";; + # From this point on, exits from the program must go via the subroutine # tests_exit(), so that suitable cleaning up can be done when required. # Arrange to catch interrupting signals, to assist with this. @@ -3915,7 +4000,7 @@ if (defined $parm_lookups{dbm} && not cp("$parm_exim_dir/exim_dbmbuild", "eximdi $dbm_build_deleted = 1; } -foreach my $tool (qw(exim_dumpdb exim_lock exinext exigrep eximstats exiqgrep exim_msgdate)) { +foreach my $tool (qw(exim_dumpdb exim_lock exinext exigrep eximstats exiqgrep exim_msgdate exim_id_update)) { cp("$parm_exim_dir/$tool" => "eximdir/$tool") or tests_exit(-1, "Failed to make a copy of $tool: $!"); } @@ -4373,6 +4458,7 @@ foreach $test (@test_list) # set up the initial sequence strings. undef %cache; + $next_msgid_old = "aX"; $next_msgid = "aX"; $next_pid = 1234; $next_port = 1111;