unit testing: Added support for doing test_init/run/deinit in separate functions.

--HG--
branch : HEAD

diff --git a/src/lib-test/test-common.c b/src/lib-test/test-common.c
index db7c974aeefc6c0562720b8909cde5ea4cc1cdaf..69e6da23e752000c42b8599abd1d48f8bc42c7e2 100644 (file)
--- a/src/lib-test/test-common.c
+++ b/src/lib-test/test-common.c
@@ -168,7 +168,7 @@ void test_out_reason(const char *name, bool success, const char *reason)
        total_count++;
 }
 
-static void test_init(void)
+void test_init(void)
 {
        test_prefix = NULL;
        failure_count = 0;
@@ -177,22 +177,27 @@ static void test_init(void)
        lib_init();
 }
 
-static int test_deinit(void)
+int test_deinit(void)
 {
        i_assert(test_prefix == NULL);
        printf("%u / %u tests failed\n", failure_count, total_count);
        return failure_count == 0 ? 0 : 1;
 }
 
-int test_run(void (*test_functions[])(void))
+void test_run_funcs(void (*test_functions[])(void))
 {
        unsigned int i;
 
-       test_init();
        for (i = 0; test_functions[i] != NULL; i++) {
                T_BEGIN {
                        test_functions[i]();
                } T_END;
        }
+}
+
+int test_run(void (*test_functions[])(void))
+{
+       test_init();
+       test_run_funcs(test_functions);
        return test_deinit();
 }

diff --git a/src/lib-test/test-common.h b/src/lib-test/test-common.h
index 4978ee2a4e751d1abab0fb97e8f4024bfcfee3d7..8ec116c0d38efe6de096eb3f115456bd4f04cd0f 100644 (file)
--- a/src/lib-test/test-common.h
+++ b/src/lib-test/test-common.h
@@ -17,4 +17,8 @@ void test_out_reason(const char *name, bool success, const char *reason);
 
 int test_run(void (*test_functions[])(void));
 
+void test_init(void);
+int test_deinit(void);
+void test_run_funcs(void (*test_functions[])(void));
+
 #endif