git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add $smtp_command_history variable
[users/heiko/exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index ec385f2940bdcd2eece9324e6f48c0fe3ddf89d5..373043c4d8c50d916b4ac09e602344057826fdce 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-1088,6
+1088,9
@@
RESET_AFTER_EXTRA_LINE_READ:
# Not all platforms build with DKIM enabled
next if /^PDKIM >> Body data for hash, canonicalized/;
# Not all platforms build with DKIM enabled
next if /^PDKIM >> Body data for hash, canonicalized/;
+ # Not all platforms have sendfile support
+ next if /^cannot use sendfile for body: no support$/;
+
# Parts of DKIM-specific debug output depend on the time/date
next if /^date:\w+,\{SP\}/;
next if /^PDKIM \[[^[]+\] (Header hash|b) computed:/;
# Parts of DKIM-specific debug output depend on the time/date
next if /^date:\w+,\{SP\}/;
next if /^PDKIM \[[^[]+\] (Header hash|b) computed:/;
@@
-1154,6
+1157,9
@@
RESET_AFTER_EXTRA_LINE_READ:
{
# Berkeley DB version differences
next if / Berkeley DB error: /;
{
# Berkeley DB version differences
next if / Berkeley DB error: /;
+
+ # CHUNKING: exact sizes depend on hostnames in headers
+ s/(=>.* K C="250- \d)\d+ (byte chunk, total \d)\d+/$1nn $2nn/;
}
# ======== All files other than stderr ========
}
# ======== All files other than stderr ========
@@
-2531,7
+2537,7
@@
GetOptions(
'keep' => \$save_output,
'slow' => \$slow,
'valgrind' => \$valgrind,
'keep' => \$save_output,
'slow' => \$slow,
'valgrind' => \$valgrind,
- 'range=
i
{2}' => \my @range_wanted,
+ 'range=
s
{2}' => \my @range_wanted,
'test=i@' => \my @tests_wanted,
'flavor|flavour=s' => $flavour,
'help' => sub { pod2usage(-exit => 0) },
'test=i@' => \my @tests_wanted,
'flavor|flavour=s' => $flavour,
'help' => sub { pod2usage(-exit => 0) },
@@
-2711,7
+2717,7
@@
if (defined $parm_trusted_config_list)
open(TCL, $parm_trusted_config_list) or die "Can't open $parm_trusted_config_list: $!\n";
my $test_config = getcwd() . '/test-config';
die "Can't find '$test_config' in TRUSTED_CONFIG_LIST $parm_trusted_config_list."
open(TCL, $parm_trusted_config_list) or die "Can't open $parm_trusted_config_list: $!\n";
my $test_config = getcwd() . '/test-config';
die "Can't find '$test_config' in TRUSTED_CONFIG_LIST $parm_trusted_config_list."
- if not grep { /^
$test_config
$/ } <TCL>;
+ if not grep { /^
\Q$test_config\E
$/ } <TCL>;
}
else
{
}
else
{
@@
-4067,7
+4073,8
@@
Keep the various output files produced during a test run. (default: don't keep)
=item B<--range> I<n0> I<n1>
=item B<--range> I<n0> I<n1>
-Run tests between (including) I<n0> and I<n1>.
+Run tests between (including) I<n0> and I<n1>. A "+" may be used to specify the "last
+test available".
=item B<--slow>
=item B<--slow>