git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log queue_time and queue_time_overall exclusive of receive time. Bug 2672
[exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index ab9b2bb95485d9eebdca21f0abf6a1138523c500..8ebba5023efcaf65f99861313d7a53f09514e676 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-33,7
+33,7
@@
use File::Copy;
use lib "$RealBin/lib";
use Exim::Runtest;
use lib "$RealBin/lib";
use Exim::Runtest;
-use Exim::Utils qw(uniq numerically);
+use Exim::Utils qw(uniq numerically
cp
);
use if $ENV{DEBUG} && scalar($ENV{DEBUG} =~ /\bruntest\b/) => 'Smart::Comments' => '####';
use if $ENV{DEBUG} && scalar($ENV{DEBUG} =~ /\bruntest\b/) => 'Data::Dumper';
use if $ENV{DEBUG} && scalar($ENV{DEBUG} =~ /\bruntest\b/) => 'Smart::Comments' => '####';
use if $ENV{DEBUG} && scalar($ENV{DEBUG} =~ /\bruntest\b/) => 'Data::Dumper';
@@
-749,7
+749,7
@@
RESET_AFTER_EXTRA_LINE_READ:
s/remote delivery process \d+ ended/remote delivery process pppp ended/;
# Pid in temp file in appendfile transport
s/remote delivery process \d+ ended/remote delivery process pppp ended/;
# Pid in temp file in appendfile transport
- s"test-mail/
temp\.\d+\."test-mail/temp
.pppp.";
+ s"test-mail/
(subdir/)?temp\K\.\d+\."
.pppp.";
# Optional pid in log lines
s/^(\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d)(\.\d{3}|)(\s[+-]\d{4}|)(\s\[\d+\])/
# Optional pid in log lines
s/^(\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d)(\.\d{3}|)(\s[+-]\d{4}|)(\s\[\d+\])/
@@
-1007,7
+1007,8
@@
RESET_AFTER_EXTRA_LINE_READ:
s/conversion: german.xn--strae-oqa.de/conversion: german.straße.de/;
# subsecond timstamp info in reported header-files
s/conversion: german.xn--strae-oqa.de/conversion: german.straße.de/;
# subsecond timstamp info in reported header-files
- s/^(-received_time_usec \.)\d{6}$/$1uuuuuu/;
+ s/^-received_time_usec \.\K\d{6}$/uuuuuu/;
+ s/^-received_time_complete \K\d+\.\d{6}$/tttt.uuuuuu/;
# Postgres server takes varible time to shut down; lives in various places
s/^waiting for server to shut down\.+ done$/waiting for server to shut down.... done/;
# Postgres server takes varible time to shut down; lives in various places
s/^waiting for server to shut down\.+ done$/waiting for server to shut down.... done/;
@@
-3746,17
+3747,15
@@
system("sudo cp eximdir/exim eximdir/exim_exim;" .
($parm_exim_dir) = $parm_exim =~ m?^(.*)/exim?;
$dbm_build_deleted = 0;
($parm_exim_dir) = $parm_exim =~ m?^(.*)/exim?;
$dbm_build_deleted = 0;
-if (defined $parm_lookups{dbm} && not c
opy("$parm_exim_dir/exim_dbmbuild", "eximdir
"))
+if (defined $parm_lookups{dbm} && not c
p("$parm_exim_dir/exim_dbmbuild", "eximdir/exim_dbmbuild
"))
{
delete $parm_lookups{dbm};
$dbm_build_deleted = 1;
}
foreach my $tool (qw(exim_dumpdb exim_lock exinext exigrep eximstats)) {
{
delete $parm_lookups{dbm};
$dbm_build_deleted = 1;
}
foreach my $tool (qw(exim_dumpdb exim_lock exinext exigrep eximstats)) {
- c
opy("$parm_exim_dir/$tool" => "eximdir/
")
+ c
p("$parm_exim_dir/$tool" => "eximdir/$tool
")
or tests_exit(-1, "Failed to make a copy of $tool: $!");
or tests_exit(-1, "Failed to make a copy of $tool: $!");
- chmod((stat "$parm_exim_dir/$tool")[2]&07777, "eximdir/$tool")
- or tests_exit(-1, "Failed to chmod $tool: $!\n");
}
# Collect some version information
}
# Collect some version information