From efede11283a5825d0c6d7d200debf1e05b1cca64 Mon Sep 17 00:00:00 2001
From: Todd Lyons <tlyons@exim.org>
Date: Fri, 18 Oct 2013 11:49:57 -0700
Subject: Adjust runtest -CONTINUE to work everywhere

---
 test/runtest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/runtest')

diff --git a/test/runtest b/test/runtest
index 6623d3b4b..27fe37199 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1083,7 +1083,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 +3252,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 = "";
-- 
cgit v1.2.3


From b3e39dd7f0113be4aeeab16dbe18b9eef8c1caad Mon Sep 17 00:00:00 2001
From: Todd Lyons <tlyons@exim.org>
Date: Sat, 19 Oct 2013 07:17:36 -0700
Subject: Tests: Don't delete patched exim if -KEEP is used

---
 test/runtest | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'test/runtest')

diff --git a/test/runtest b/test/runtest
index 27fe37199..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);
-- 
cgit v1.2.3