dovecot-2.0-pigeonhole: Testsuite: minor cleanups.
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Mon Aug 2 16:19:12 EEST 2010
details: http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/a904a64890bd
changeset: 1351:a904a64890bd
user: Stephan Bosch <stephan at rename-it.nl>
date: Mon Aug 02 15:19:05 2010 +0200
description:
Testsuite: minor cleanups.
diffstat:
src/testsuite/testsuite.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diffs (59 lines):
diff -r f35b814f2975 -r a904a64890bd src/testsuite/testsuite.c
--- a/src/testsuite/testsuite.c Mon Aug 02 15:18:51 2010 +0200
+++ b/src/testsuite/testsuite.c Mon Aug 02 15:19:05 2010 +0200
@@ -84,7 +84,6 @@
struct sieve_instance *svinst;
const char *scriptfile, *dumpfile, *tracefile;
struct sieve_trace_config tr_config;
- struct ostream *tracestream = NULL;
struct sieve_binary *sbin;
const char *sieve_dir;
bool log_stdout = FALSE;
@@ -166,17 +165,18 @@
/* Compile sieve script */
if ( (sbin = sieve_tool_script_compile(svinst, scriptfile, NULL)) != NULL ) {
struct sieve_error_handler *ehandler;
+ struct ostream *tracestream = NULL;
struct sieve_script_env scriptenv;
/* Dump script */
sieve_tool_dump_binary_to(sbin, dumpfile);
-
+
+ if ( tracefile != NULL )
+ tracestream = sieve_tool_open_output_stream(tracefile);
+
testsuite_mailstore_init();
testsuite_message_init();
- if ( tracefile != NULL )
- tracestream = sieve_tool_open_output_stream(tracefile);
-
memset(&scriptenv, 0, sizeof(scriptenv));
scriptenv.user = sieve_tool_get_mail_user(sieve_tool);
scriptenv.default_mailbox = "INBOX";
@@ -213,19 +213,20 @@
sieve_close(&sbin);
- if ( scriptenv.trace_stream != NULL )
- o_stream_unref(&scriptenv.trace_stream);
-
/* De-initialize message environment */
testsuite_message_deinit();
testsuite_mailstore_deinit();
testsuite_result_deinit();
+
+ if ( tracestream != NULL )
+ o_stream_unref(&tracestream);
+
} else {
testsuite_testcase_fail("failed to compile testcase script");
}
/* De-initialize testsuite */
- testsuite_deinit();
+ testsuite_deinit();
testsuite_settings_deinit();
sieve_tool_deinit(&sieve_tool);
More information about the dovecot-cvs
mailing list