From a635143d62a11c9993225e6c2f4d563c29d7b639 Mon Sep 17 00:00:00 2001
From: Petr Rockai <prockai@redhat.com>
Date: Wed, 15 Feb 2012 01:31:10 +0000
Subject: [PATCH] In the test harness, do the back-substitution (@TESTDIR@,
 @PREFIX@) also on the live VERBOSE output, not just the post-mortem dumps.

---
 test/lib/harness.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/lib/harness.c b/test/lib/harness.c
index 43975be52..5c17e747d 100644
--- a/test/lib/harness.c
+++ b/test/lib/harness.c
@@ -119,6 +119,14 @@ static void dump(void) {
 	}
 }
 
+static void trickle() {
+	static int counter_last = -1, counter = 0;
+	while ( counter < readbuf_used && counter != counter_last ) {
+		counter_last = counter;
+		counter = outline( readbuf, counter, 1 );
+	}
+}
+
 static void clear(void) {
 	readbuf_used = 0;
 }
@@ -131,12 +139,12 @@ static void drain(void) {
 		sz = read(fds[1], buf, sizeof(buf));
 		if (sz <= 0)
 			return;
-		if (verbose)
-			write(1, buf, sz);
 		if (readbuf_used + sz >= readbuf_sz) {
 			readbuf_sz = readbuf_sz ? 2 * readbuf_sz : 4096;
 			readbuf = realloc(readbuf, readbuf_sz);
 		}
+		if (verbose)
+			trickle();
 		if (!readbuf)
 			exit(205);
 		memcpy(readbuf + readbuf_used, buf, sz);