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
Add testsuite case retry (without update) option on failed file compare.
[exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index 31aaaa902e83364e7cbb081e9da724915447c2ec..c199539a54e41ccd785fff9efa0da5113dc21840 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-938,7
+938,7
@@
if ($_[1]) { $_ = "u"; print "... update forced\n"; }
# [4] TRUE if this is a log file whose deliveries must be sorted
#
# Returns: 0 comparison succeeded or differences to be ignored
# [4] TRUE if this is a log file whose deliveries must be sorted
#
# Returns: 0 comparison succeeded or differences to be ignored
-# 1 comparison failed; files
were
updated (=> re-compare)
+# 1 comparison failed; files
may have been
updated (=> re-compare)
#
# Does not return if the user replies "Q" to a prompt.
#
# Does not return if the user replies "Q" to a prompt.
@@
-1096,9
+1096,10
@@
if (-e $sf)
print "\n";
for (;;)
{
print "\n";
for (;;)
{
- interact("Continue, Update & retry, Quit? [Q] ", $force_update);
+ interact("Continue,
Retry,
Update & retry, Quit? [Q] ", $force_update);
tests_exit(1) if /^q?$/i;
return 0 if /^c$/i;
tests_exit(1) if /^q?$/i;
return 0 if /^c$/i;
+ return 1 if /^r$/i;
last if (/^u$/i);
}
}
last if (/^u$/i);
}
}
@@
-1130,7
+1131,7
@@
return 1;
#
# Arguments: none
# Returns: 0 if the output compared equal
#
# Arguments: none
# Returns: 0 if the output compared equal
-# 1 if
files were updated and the test must be re-run
+# 1 if
re-run needed (files may have been updated)
sub check_output{
my($yield) = 0;
sub check_output{
my($yield) = 0;