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
Testsuite: updates for 8bitmime-as-default (GnuTLS).
[exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index d42d400a961ad7bcba8ffdfcb354d328cfb2e8fc..8f5d9b60cf0c5c3dda3cdca8049355b5a1d1b063 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-3200,10
+3200,10
@@
foreach $test (@test_list)
for (;;)
{
for (;;)
{
- print "\nshow stdErr, show stdOut, Continue (without file comparison), or Quit? [Q] ";
+ print "\nshow stdErr, show stdOut,
Retry,
Continue (without file comparison), or Quit? [Q] ";
$_ = <T>;
tests_exit(1) if /^q?$/i;
$_ = <T>;
tests_exit(1) if /^q?$/i;
- last if /^
c
$/i;
+ last if /^
[rc]
$/i;
if (/^e$/i)
{
system("$more test-stderr");
if (/^e$/i)
{
system("$more test-stderr");
@@
-3214,6
+3214,7
@@
foreach $test (@test_list)
}
}
}
}
+ $retry = 1 if /^r$/i;
$docheck = 0;
}
$docheck = 0;
}
@@
-3236,10
+3237,10
@@
foreach $test (@test_list)
for (;;)
{
for (;;)
{
- print "\nShow server stdout, Continue, or Quit? [Q] ";
+ print "\nShow server stdout,
Retry,
Continue, or Quit? [Q] ";
$_ = <T>;
tests_exit(1) if /^q?$/i;
$_ = <T>;
tests_exit(1) if /^q?$/i;
- last if /^
c
$/i;
+ last if /^
[rc]
$/i;
if (/^s$/i)
{
if (/^s$/i)
{
@@
-3249,6
+3250,7
@@
foreach $test (@test_list)
close(S);
}
}
close(S);
}
}
+ $retry = 1 if /^r$/i;
}
}
}
}
}
}
@@
-3259,6
+3261,13
@@
foreach $test (@test_list)
# function returns 0 if all is well, 1 if we should rerun the test (the files
# have been updated). It does not return if the user responds Q to a prompt.
# function returns 0 if all is well, 1 if we should rerun the test (the files
# have been updated). It does not return if the user responds Q to a prompt.
+ if ($retry)
+ {
+ $retry = '0';
+ print (("#" x 79) . "\n");
+ redo;
+ }
+
if ($docheck)
{
if (check_output() != 0)
if ($docheck)
{
if (check_output() != 0)