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
Lookups: fix mysql lookup returns for no-data "queries",
[exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index 2a13b4832d92f945d7ecc63ecf591b056dacf7d2..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"; }
@@
-2762,6
+2764,9
@@
die "CONFIGURE_GROUP ($parm_configure_group) does not match the group invoking $
if 0020 & (stat "$parm_cwd/test-config")[2]
and $parm_configure_group != $);
if 0020 & (stat "$parm_cwd/test-config")[2]
and $parm_configure_group != $);
+die "aux-fixed file is world-writeable; best to strip them all, recursively\n"
+ if 0020 & (stat "aux-fixed/0037.f-1")[2];
+
open(EXIMINFO, "$parm_exim -d-all+transport -bV -C $parm_cwd/test-config -DDIR=$parm_cwd |") ||
die "** Cannot run $parm_exim: $!\n";
open(EXIMINFO, "$parm_exim -d-all+transport -bV -C $parm_cwd/test-config -DDIR=$parm_cwd |") ||
die "** Cannot run $parm_exim: $!\n";
@@
-2836,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";
@@
-3146,6
+3160,12
@@
unless (defined $parm_eximgroup)
die "** ABANDONING.\n";
}
die "** ABANDONING.\n";
}
+if ($parm_caller_home eq $parm_cwd)
+ {
+ print "will confuse working dir with homedir; change homedir\n";
+ die "** ABANDONING.\n";
+ }
+
print "You need to be in the Exim group to run these tests. Checking ...";
if (`groups` =~ /\b\Q$parm_eximgroup\E\b/)
print "You need to be in the Exim group to run these tests. Checking ...";
if (`groups` =~ /\b\Q$parm_eximgroup\E\b/)
@@
-3500,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\": \"$_\"");