dovecot-1.2-sieve: Testsuite: added command line parameter for c...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-1.2-sieve/rev/fb8ec5883873
changeset: 1179:fb8ec5883873
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Sun Jan 03 16:31:37 2010 +0100
description:
Testsuite: added command line parameter for copying errors to stderr.

diffstat:

 src/testsuite/testsuite-common.c |   4 ++--
 src/testsuite/testsuite-common.h |   2 +-
 src/testsuite/testsuite-log.c    |   4 +++-
 src/testsuite/testsuite-log.h    |   2 +-
 src/testsuite/testsuite.c        |  27 +++++++++++++++------------
 5 files changed, 22 insertions(+), 17 deletions(-)

diffs (132 lines):

diff -r 5ba2e2d73892 -r fb8ec5883873 src/testsuite/testsuite-common.c
--- a/src/testsuite/testsuite-common.c	Sun Jan 03 02:19:33 2010 +0100
+++ b/src/testsuite/testsuite-common.c	Sun Jan 03 16:31:37 2010 +0100
@@ -232,10 +232,10 @@
  * Main testsuite init/deinit
  */
 
-void testsuite_init(struct sieve_instance *svinst)
+void testsuite_init(struct sieve_instance *svinst, bool log_stdout)
 {
 	testsuite_test_context_init();
-	testsuite_log_init();
+	testsuite_log_init(log_stdout);
 	testsuite_tmp_dir_init();
 	
 	testsuite_script_init();
diff -r 5ba2e2d73892 -r fb8ec5883873 src/testsuite/testsuite-common.h
--- a/src/testsuite/testsuite-common.h	Sun Jan 03 02:19:33 2010 +0100
+++ b/src/testsuite/testsuite-common.h	Sun Jan 03 16:31:37 2010 +0100
@@ -152,7 +152,7 @@
  * Testsuite init/deinit 
  */
 
-void testsuite_init(struct sieve_instance *svinst);
+void testsuite_init(struct sieve_instance *svinst, bool log_stdout);
 void testsuite_deinit(void);
 
 #endif /* __TESTSUITE_COMMON_H */
diff -r 5ba2e2d73892 -r fb8ec5883873 src/testsuite/testsuite-log.c
--- a/src/testsuite/testsuite-log.c	Sun Jan 03 02:19:33 2010 +0100
+++ b/src/testsuite/testsuite-log.c	Sun Jan 03 16:31:37 2010 +0100
@@ -101,8 +101,10 @@
 	return msg->message;		
 }
 
-void testsuite_log_init(void)
+void testsuite_log_init(bool log_stdout)
 {
+	_testsuite_log_stdout = log_stdout;
+
 	testsuite_log_ehandler = _testsuite_log_ehandler_create(); 	
 	sieve_error_handler_accept_infolog(testsuite_log_ehandler, TRUE);
 
diff -r 5ba2e2d73892 -r fb8ec5883873 src/testsuite/testsuite-log.h
--- a/src/testsuite/testsuite-log.h	Sun Jan 03 02:19:33 2010 +0100
+++ b/src/testsuite/testsuite-log.h	Sun Jan 03 16:31:37 2010 +0100
@@ -8,7 +8,7 @@
 
 extern struct sieve_error_handler *testsuite_log_ehandler;
 
-void testsuite_log_init(void);
+void testsuite_log_init(bool log_stdout);
 void testsuite_log_deinit(void);
 
 void testsuite_log_clear_messages(void);
diff -r 5ba2e2d73892 -r fb8ec5883873 src/testsuite/testsuite.c
--- a/src/testsuite/testsuite.c	Sun Jan 03 02:19:33 2010 +0100
+++ b/src/testsuite/testsuite.c	Sun Jan 03 16:31:37 2010 +0100
@@ -51,7 +51,7 @@
 	testsuite_setting_get
 };
 
-static void testsuite_tool_init(const char *extensions) 
+static void testsuite_tool_init(const char *extensions, bool log_stdout) 
 {
 	testsuite_settings_init();
 
@@ -59,7 +59,7 @@
 
 	sieve_extensions_set_string(sieve_instance, extensions);
 	
-	testsuite_init(sieve_instance);
+	testsuite_init(sieve_instance, log_stdout);
 }
 
 static void testsuite_tool_deinit(void)
@@ -78,7 +78,7 @@
 static void print_help(void)
 {
 	printf(
-"Usage: testsuite [-d <dump filename>] <scriptfile>\n"
+"Usage: testsuite [-t][-E][-d <dump filename>] <scriptfile>\n"
 	);
 }
 
@@ -117,7 +117,7 @@
 	int i, ret;
 	struct sieve_binary *sbin;
 	const char *sieve_dir;
-	bool trace = FALSE;
+	bool trace = FALSE, log_stdout = FALSE;
 
 	/* Parse arguments */
 	scriptfile = dumpfile = extensions = NULL;
@@ -129,18 +129,21 @@
 				i_fatal("Missing -d argument");
 			dumpfile = argv[i];
 		} else if (strcmp(argv[i], "-x") == 0) {
-            /* extensions */
-            i++;
-            if (i == argc) {
-                print_help();
-                i_fatal("Missing -x argument");
-            }
-            extensions = argv[i];
+			/* extensions */
+			i++;
+			if (i == argc) {
+				print_help();
+				i_fatal("Missing -x argument");
+			}
+			extensions = argv[i];
 #ifdef SIEVE_RUNTIME_TRACE
 		} else if (strcmp(argv[i], "-t") == 0) {
 			/* runtime trace */
 			trace = TRUE;
 #endif
+		} else if (strcmp(argv[i], "-E") == 0) {
+			/* runtime trace */
+			log_stdout = TRUE;
 		} else if ( scriptfile == NULL ) {
 			scriptfile = argv[i];
 		} else {
@@ -157,7 +160,7 @@
 	printf("Test case: %s:\n\n", scriptfile);
 
 	/* Initialize testsuite */
-	testsuite_tool_init(extensions);
+	testsuite_tool_init(extensions, log_stdout);
 
 	/* Settings */