[exim-cvs] Fix runtest -CONTINUE to work everywhere

Pàgina inicial
Delete this message
Reply to this message
Autor: Exim Git Commits Mailing List
Data:  
A: exim-cvs
Assumpte: [exim-cvs] Fix runtest -CONTINUE to work everywhere
Gitweb: http://git.exim.org/exim.git/commitdiff/825fae12de435166c3706fa21ea7ccc8423c48bb
Commit:     825fae12de435166c3706fa21ea7ccc8423c48bb
Parent:     4c3e261358809a572aee804633234a4df35bfaf9
Author:     Todd Lyons <tlyons@???>
AuthorDate: Mon Apr 8 10:20:46 2013 -0700
Committer:  Todd Lyons <tlyons@???>
CommitDate: Mon Apr 8 10:32:12 2013 -0700


    Fix runtest -CONTINUE to work everywhere


    Changes the $more variable to just cat the changes to STDOUT and not
      pipe it through less or more.
---
 test/runtest |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


diff --git a/test/runtest b/test/runtest
index 0514c05..6623d3b 100755
--- a/test/runtest
+++ b/test/runtest
@@ -2165,7 +2165,9 @@ while (@ARGV > 0 && $ARGV[0] =~ /^-/)
     {
     if ($arg eq "-DEBUG")  { $debug = 1; $cr = "\n"; next; }
     if ($arg eq "-DIFF")   { $cf = "diff -u"; next; }
-    if ($arg eq "-CONTINUE"){$force_continue = 1; next; }
+    if ($arg eq "-CONTINUE"){$force_continue = 1;
+                             $more = "cat";
+                             next; }
     if ($arg eq "-UPDATE") { $force_update = 1; next; }
     if ($arg eq "-NOIPV4") { $have_ipv4 = 0; next; }
     if ($arg eq "-NOIPV6") { $have_ipv6 = 0; next; }
@@ -3461,9 +3463,10 @@ foreach $test (@test_list)
       for (;;)
         {
         print "\nshow stdErr, show stdOut, Retry, Continue (without file comparison), or Quit? [Q] ";
-        $_ = <T>;
+        $_ = $force_continue ? "c" : <T>;
         tests_exit(1) if /^q?$/i;
         log_failure($log_failed_filename, $testno, "exit code unexpected") if (/^c$/i && $force_continue);
+        print "... continue forced\n" if $force_continue;
         last if /^[rc]$/i;
         if (/^e$/i)
           {
@@ -3499,9 +3502,10 @@ foreach $test (@test_list)
         for (;;)
           {
           print "\nShow server stdout, Retry, Continue, or Quit? [Q] ";
-          $_ = <T>;
+          $_ = $force_continue ? "c" : <T>;
           tests_exit(1) if /^q?$/i;
           log_failure($log_failed_filename, $testno, "exit code unexpected") if (/^c$/i && $force_continue);
+          print "... continue forced\n" if $force_continue;
           last if /^[rc]$/i;


           if (/^s$/i)