X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bd0f95ded48f560cb1f9f8b808e1abaabeb4d4ec..1011d57310ad2ecdb29b7ddb783baa19c3ed1ffa:/test/runtest diff --git a/test/runtest b/test/runtest index 82ae480ce..bc570842a 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/; @@ -845,10 +852,10 @@ RESET_AFTER_EXTRA_LINE_READ: # ======== IP error numbers and messages ======== # These vary between operating systems - s/Can(no|')t assign requested address/Network Error/; + s/Can(no|')t assign requested address/Netwk addr not available/; s/Operation timed out/Connection timed out/; s/Address family not supported by protocol family/Network Error/; - s/Network( is)? unreachable/Network Error/; + s/Network( is)? unreachable/Network unreachable/; s/Invalid argument/Network Error/; s/\(\d+\): Network/(dd): Network/; @@ -884,7 +891,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} <)/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 +1069,10 @@ 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/; + s/^\s*\d*[hd](?= 317 [0-9A-Za-z\-]{23} {msglog})); @@ -2508,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. @@ -2599,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; @@ -3912,7 +3943,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: $!"); } @@ -4051,10 +4082,10 @@ DIR: for (my $i = 0; $i < @test_dirs; $i++) { if (!defined $parm_malware{$1}) { $wantthis = 0; last; } } - elsif (/^feature (.*)$/) + elsif (/^(not )?feature (.*)$/) { # move to a subroutine? - my $eximinfo = "$parm_exim -C $parm_cwd/test-config -DDIR=$parm_cwd -bP macro $1"; + my $eximinfo = "$parm_exim -C $parm_cwd/test-config -DDIR=$parm_cwd -bP macro $2"; open (IN, "$parm_cwd/confs/0000") || tests_exit(-1, "Couldn't open $parm_cwd/confs/0000: $!\n"); @@ -4069,10 +4100,10 @@ DIR: for (my $i = 0; $i < @test_dirs; $i++) close(OUT); system($eximinfo . " >/dev/null 2>&1"); - if ($? != 0) { - unlink("$parm_cwd/test-config"); + if (!defined $1 && $? != 0 || defined $1 && $? == 0) { $wantthis = 0; - $_ = "feature $1"; + unlink("$parm_cwd/test-config"); + $_ = $1 || "" . "feature $2"; last; } unlink("$parm_cwd/test-config"); @@ -4370,6 +4401,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;