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
SPF: promote from Experimental to mainline status
[users/heiko/exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index a1259f76920c8b73671e260c1d66d71a31bfd04c..5671fead24ab93a1ee3ff9f7cab4f39bacb6571d 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-1158,6
+1158,7
@@
RESET_AFTER_EXTRA_LINE_READ:
/^Support for:/ ||
/^Routers:/ ||
/^Transports:/ ||
/^Support for:/ ||
/^Routers:/ ||
/^Transports:/ ||
+ /^Malware:/ ||
/^log selectors =/ ||
/^cwd=/ ||
/^Fixed never_users:/ ||
/^log selectors =/ ||
/^cwd=/ ||
/^Fixed never_users:/ ||
@@
-2428,6
+2429,7
@@
elsif (/^background$/)
$_ = <SCRIPT>; $lineno++;
chomp;
$_ = <SCRIPT>; $lineno++;
chomp;
+ do_substitute($testno);
$line = $_;
if ($debug) { printf ">> daemon: $line >>test-stdout 2>>test-stderr\n"; }
$line = $_;
if ($debug) { printf ">> daemon: $line >>test-stdout 2>>test-stderr\n"; }
@@
-2839,6
+2841,15
@@
while (<EXIMINFO>)
}
}
}
}
}
}
+
+ elsif (/^Malware: (.*)/)
+ {
+ print;
+ @temp = split /(\s+)/, $1;
+ push(@temp, ' ');
+ %parm_malware = @temp;
+ }
+
}
close(EXIMINFO);
print "-" x 78, "\n";
}
close(EXIMINFO);
print "-" x 78, "\n";
@@
-3509,6
+3520,10
@@
DIR: for (my $i = 0; $i < @test_dirs; $i++)
{
if (!defined $parm_transports{$1}) { $wantthis = 0; last; }
}
{
if (!defined $parm_transports{$1}) { $wantthis = 0; last; }
}
+ elsif (/^malware (.*)$/)
+ {
+ if (!defined $parm_malware{$1}) { $wantthis = 0; last; }
+ }
else
{
tests_exit(-1, "Unknown line in \"scripts/$testdir/REQUIRES\": \"$_\"");
else
{
tests_exit(-1, "Unknown line in \"scripts/$testdir/REQUIRES\": \"$_\"");