dovecot-2.1-pigeonhole: Testsuite: fixed displaying debug messages.

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.1-pigeonhole/rev/09e393e4274b
changeset: 1632:09e393e4274b
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Sat Aug 04 09:34:21 2012 +0200
description:
Testsuite: fixed displaying debug messages.

diffstat:

 src/testsuite/testsuite-log.c |  66 +++++++++++++++++++++---------------------
 1 files changed, 33 insertions(+), 33 deletions(-)

diffs (128 lines):

diff -r 6a34eda7924e -r 09e393e4274b src/testsuite/testsuite-log.c
--- a/src/testsuite/testsuite-log.c	Fri Aug 03 19:52:36 2012 +0200
+++ b/src/testsuite/testsuite-log.c	Sat Aug 04 09:34:21 2012 +0200
@@ -35,6 +35,23 @@
 ARRAY_DEFINE(_testsuite_log_warnings, struct _testsuite_log_message);
 ARRAY_DEFINE(_testsuite_log_messages, struct _testsuite_log_message);
 
+static inline void ATTR_FORMAT(3, 0) _testsuite_stdout_vlog
+(const char *prefix, const char *location, const char *fmt,
+	va_list args)
+{
+	if ( _testsuite_log_stdout ) {
+		va_list args_copy;
+		VA_COPY(args_copy, args);
+
+		if ( location == NULL || *location == '\0' )
+			fprintf(stdout,
+				"LOG: %s: %s\n", prefix, t_strdup_vprintf(fmt, args_copy));
+		else
+			fprintf(stdout,
+				"LOG: %s: %s: %s\n", prefix, location, t_strdup_vprintf(fmt, args_copy));
+	}
+}
+
 static void ATTR_FORMAT(4, 0) _testsuite_log_verror
 (struct sieve_error_handler *ehandler ATTR_UNUSED,
 	unsigned int flags ATTR_UNUSED, const char *location, const char *fmt,
@@ -43,17 +60,7 @@
 	pool_t pool = _testsuite_logmsg_pool;
 	struct _testsuite_log_message msg;
 
-	if ( _testsuite_log_stdout ) {
-		va_list args_copy;
-		VA_COPY(args_copy, args);
-
-		if ( location == NULL || *location == '\0' )
-			fprintf(stdout,
-				"LOG: error: %s\n", t_strdup_vprintf(fmt, args_copy));
-		else
-			fprintf(stdout,
-				"LOG: error: %s: %s\n", location, t_strdup_vprintf(fmt, args_copy));
-	}
+	_testsuite_stdout_vlog("error", location, fmt, args);
 
 	msg.location = p_strdup(pool, location);
 	msg.message = p_strdup_vprintf(pool, fmt, args);
@@ -82,17 +89,7 @@
 	pool_t pool = _testsuite_logmsg_pool;
 	struct _testsuite_log_message msg;
 
-	if ( _testsuite_log_stdout ) {
-		va_list args_copy;
-		VA_COPY(args_copy, args);
-
-		if ( location == NULL || *location == '\0' )
-			fprintf(stdout,
-				"LOG: warning: %s\n", t_strdup_vprintf(fmt, args_copy));
-		else
-			fprintf(stdout,
-				"LOG: warning: %s: %s\n", location, t_strdup_vprintf(fmt, args_copy));
-	}
+	_testsuite_stdout_vlog("warning", location, fmt, args);
 
 	msg.location = p_strdup(pool, location);
 	msg.message = p_strdup_vprintf(pool, fmt, args);
@@ -108,17 +105,7 @@
 	pool_t pool = _testsuite_logmsg_pool;
 	struct _testsuite_log_message msg;
 
-	if ( _testsuite_log_stdout ) {
-		va_list args_copy;
-		VA_COPY(args_copy, args);
-
-		if ( location == NULL || *location == '\0' )
-			fprintf(stdout,
-				"LOG: info: %s\n", t_strdup_vprintf(fmt, args_copy));
-		else
-			fprintf(stdout,
-				"LOG: info: %s: %s\n", location, t_strdup_vprintf(fmt, args_copy));
-	}
+	_testsuite_stdout_vlog("info", location, fmt, args);
 
 	msg.location = p_strdup(pool, location);
 	msg.message = p_strdup_vprintf(pool, fmt, args);
@@ -126,6 +113,15 @@
 	array_append(&_testsuite_log_messages, &msg, 1);
 }
 
+
+static void ATTR_FORMAT(4, 0) _testsuite_log_vdebug
+(struct sieve_error_handler *ehandler ATTR_UNUSED,
+	unsigned int flags ATTR_UNUSED, const char *location, const char *fmt,
+	va_list args)
+{
+	_testsuite_stdout_vlog("debug", location, fmt, args);
+}
+
 static struct sieve_error_handler *_testsuite_log_ehandler_create(void)
 {
 	pool_t pool;
@@ -139,6 +135,7 @@
 	ehandler->verror = _testsuite_log_verror;
 	ehandler->vwarning = _testsuite_log_vwarning;
 	ehandler->vinfo = _testsuite_log_vinfo;
+	ehandler->vdebug = _testsuite_log_vdebug;
 
 	return ehandler;
 }
@@ -156,6 +153,7 @@
 	ehandler->verror = _testsuite_log_main_verror;
 	ehandler->vwarning = _testsuite_log_vwarning;
 	ehandler->vinfo = _testsuite_log_vinfo;
+	ehandler->vdebug = _testsuite_log_vdebug;
 
 	return ehandler;
 }
@@ -192,9 +190,11 @@
 
 	testsuite_log_ehandler = _testsuite_log_ehandler_create(); 
 	sieve_error_handler_accept_infolog(testsuite_log_ehandler, TRUE);
+	sieve_error_handler_accept_debuglog(testsuite_log_ehandler, TRUE);
 
 	testsuite_log_main_ehandler = _testsuite_log_main_ehandler_create(); 
 	sieve_error_handler_accept_infolog(testsuite_log_main_ehandler, TRUE);
+	sieve_error_handler_accept_debuglog(testsuite_log_main_ehandler, TRUE);
 
 	sieve_system_ehandler_set(testsuite_log_ehandler);