From ba59b14d895cc44ddb548eb1f70f75377655b638 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 22 May 2016 13:38:08 +0100 Subject: [PATCH] Testsuite: fix for 0574 --- test/runtest | 2 +- test/src/cf.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/runtest b/test/runtest index 2389efafe..3403d78de 100755 --- a/test/runtest +++ b/test/runtest @@ -1415,7 +1415,7 @@ $munges = 'rejectlog' => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1/'}, 'debuglog_stdout' => - { 'stdout' => 's/^\d\d:\d\d:\d\d* \d+ //; + { 'stdout' => 's/^\d\d:\d\d:\d\d\s+\d+ //; s/Process \d+ is ready for new message/Process pppp is ready for new message/' }, }; diff --git a/test/src/cf.c b/test/src/cf.c index 1fce2e351..2b982f10f 100644 --- a/test/src/cf.c +++ b/test/src/cf.c @@ -41,6 +41,7 @@ Translated back into C, March 1990! */ #define version 8 #define defaultstore 100000 /* default recovery buffer size */ #define minstore 500 /* minimum recovery buffer size */ +#define SHOWMAX 20 /* maximum number of diff lines to display */ /* ----- misc defines ----- */ @@ -258,11 +259,11 @@ else if (t1 < 0 && t2 < 0) if (echo) { rule('-', 10); - if (-t1-s1 < 21) write_lines(rootline_one, tline_one); - else fprintf(f_out, "... ...\n"); + if (-t1-s1 < SHOWMAX+1) write_lines(rootline_one, tline_one); + else fprintf(f_out, "... ...\n", SHOWMAX); rule('-', 10); - if (-t2-s2 < 21) write_lines(rootline_two, tline_two); - else fprintf(f_out, "... ...\n"); + if (-t2-s2 < SHOWMAX+1) write_lines(rootline_two, tline_two); + else fprintf(f_out, "... ...\n", SHOWMAX); } } -- 2.30.2