projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Alain Williams' patch for disabling LDAP referrals when requested.
[exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index 397ea474d49bf72aaade097c2feebd5838548491..37b6fbed47b7ee7e8270fc7ab9a600942a46a9c0 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-1,6
+1,6
@@
#! /usr/bin/perl -w
#! /usr/bin/perl -w
-# $Cambridge: exim/test/runtest,v 1.1
0 2006/04/28 13:46:36
ph10 Exp $
+# $Cambridge: exim/test/runtest,v 1.1
2 2006/07/04 09:07:20
ph10 Exp $
###############################################################################
# This is the controlling script for the "new" test suite for Exim. It should #
###############################################################################
# This is the controlling script for the "new" test suite for Exim. It should #
@@
-413,7
+413,8
@@
while(<IN>)
my($next) = $3 - $2;
$_ = " first failed=dddd last try=dddd next try=+$next $4\n";
}
my($next) = $3 - $2;
$_ = " first failed=dddd last try=dddd next try=+$next $4\n";
}
- s/^now=\d+ received_time=\d+ diff=\d+ timeout=(\d+)/now=tttt received_time=tttt diff=tttt timeout=$1/;
+ s/^(\s*)now=\d+ first_failed=\d+ next_try=\d+ expired=(\d)/$1now=tttt first_failed=tttt next_try=tttt expired=$2/;
+ s/^(\s*)received_time=\d+ diff=\d+ timeout=(\d+)/$1received_time=tttt diff=tttt timeout=$2/;
# Time to retry may vary
s/time to retry = \S+/time to retry = tttt/;
# Time to retry may vary
s/time to retry = \S+/time to retry = tttt/;
@@
-858,7
+859,7
@@
my($rf,$rsf,$mf,$sf,$sortfile) = @_;
if (! -e $sf)
{
if (! -e $sf)
{
- return 0 if (! -s $rf &&
! -s $rsf
);
+ return 0 if (! -s $rf &&
(! defined $rsf || ! -s $rsf)
);
print "\n";
print "** $rf is not empty\n" if (-s $rf);
print "\n";
print "** $rf is not empty\n" if (-s $rf);