summaryrefslogtreecommitdiff
path: root/test/runtest
diff options
context:
space:
mode:
authorTodd Lyons <tlyons@exim.org>2013-10-22 05:11:33 -0700
committerTodd Lyons <tlyons@exim.org>2013-10-22 05:11:33 -0700
commitb79bf0ff013a1cbb22845ffa15411d5af30bf278 (patch)
tree42466bd6e68ca69fd608f451fd1c1dd4dd30d35f /test/runtest
parent112b6a936caca17b2520ad81d0374c8aae1e4350 (diff)
parent2519e60d2f6124589a6a5b922dd9ae6bcb6f6588 (diff)
Merge branch 'master' of git://git.exim.org/eximexim-4_82_RC5
Diffstat (limited to 'test/runtest')
-rwxr-xr-xtest/runtest7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/runtest b/test/runtest
index 6623d3b4b..443d7fcf4 100755
--- a/test/runtest
+++ b/test/runtest
@@ -193,7 +193,8 @@ close(T);
system("sudo /bin/rm -rf ./spool test-* ./dnszones/*")
if ($rc == 0 && !$save_output);
-system("sudo /bin/rm -rf ./eximdir/*");
+system("sudo /bin/rm -rf ./eximdir/*")
+ if (!$save_output);
print "\nYou were in test $test at the end there.\n\n" if defined $test;
exit $rc if ($rc >= 0);
@@ -1083,7 +1084,7 @@ if (! -e $sf)
for (;;)
{
print "Continue, Show, or Quit? [Q] ";
- $_ = <T>;
+ $_ = $force_continue ? "c" : <T>;
tests_exit(1) if /^q?$/i;
log_failure($log_failed_filename, $testno, $rf) if (/^c$/i && $force_continue);
return 0 if /^c$/i;
@@ -3252,7 +3253,7 @@ closedir(DIR);
open(T, "/dev/tty") || tests_exit(-1, "Failed to open /dev/tty: $!");
print "\nPress RETURN to run the tests: ";
-$_ = <T>;
+$_ = $force_continue ? "c" : <T>;
print "\n";
$lasttestdir = "";