summaryrefslogtreecommitdiff
path: root/test/runtest
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2012-05-10 22:55:58 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2012-05-10 22:55:58 +0100
commit4be52428d30e22d6559876650d614473b4bc8e78 (patch)
tree4f6d685692451eae4d092d3ecf9f0e68a292752f /test/runtest
parent602e02546c7e38b36e4f741dad369ff46ccdea4b (diff)
Testsuite: updates for 8bitmime-as-default (GnuTLS).
Also add Retry command to more runtest testcase-fail possibilities.
Diffstat (limited to 'test/runtest')
-rwxr-xr-xtest/runtest17
1 files changed, 13 insertions, 4 deletions
diff --git a/test/runtest b/test/runtest
index d42d400a9..8f5d9b60c 100755
--- a/test/runtest
+++ b/test/runtest
@@ -3200,10 +3200,10 @@ foreach $test (@test_list)
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;
- last if /^c$/i;
+ last if /^[rc]$/i;
if (/^e$/i)
{
system("$more test-stderr");
@@ -3214,6 +3214,7 @@ foreach $test (@test_list)
}
}
+ $retry = 1 if /^r$/i;
$docheck = 0;
}
@@ -3236,10 +3237,10 @@ foreach $test (@test_list)
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;
- last if /^c$/i;
+ last if /^[rc]$/i;
if (/^s$/i)
{
@@ -3249,6 +3250,7 @@ foreach $test (@test_list)
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.
+ if ($retry)
+ {
+ $retry = '0';
+ print (("#" x 79) . "\n");
+ redo;
+ }
+
if ($docheck)
{
if (check_output() != 0)