lib-program-client: Make debug mode for test suite optional.

It is now disabled by default.

diff --git a/src/lib-program-client/test-program-client-local.c b/src/lib-program-client/test-program-client-local.c
index ca13104c7aca54a25301ef6ded1f584954240089..7eaa838ad15472b9ee0c3f52154571475b0a018a 100644 (file)
--- a/src/lib-program-client/test-program-client-local.c
+++ b/src/lib-program-client/test-program-client-local.c
@@ -10,6 +10,8 @@
 #include "lib-signals.h"
 #include "program-client.h"
 
+#include <unistd.h>
+
 static const char *pclient_test_io_string = 
        "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
        "Praesent vehicula ac leo vel placerat. Nullam placerat \n"
@@ -24,7 +26,7 @@ static const char *pclient_test_io_string =
 static struct program_client_settings pc_set = {
        .client_connect_timeout_msecs = 5000,
        .input_idle_timeout_msecs = 1000,
-       .debug = TRUE,
+       .debug = FALSE,
        .restrict_set = {
                .uid = (uid_t)-1,
                .gid = (gid_t)-1,
@@ -224,10 +226,10 @@ static void test_program_io_big(void)
        test_end();
 }
 
-int main(void)
+int main(int argc, char *argv[])
 {
        struct ioloop *ioloop;
-       int ret;
+       int ret, c;
 
        void (*tests[])(void) = {
                test_program_success,
@@ -240,6 +242,16 @@ int main(void)
 
        lib_init();
 
+       while ((c = getopt(argc, argv, "D")) > 0) {
+               switch (c) {
+               case 'D':
+                       pc_set.debug = TRUE;
+                       break;
+               default:
+                       i_fatal("Usage: %s [-D]", argv[0]);
+               }
+       }
+
        ioloop = io_loop_create();
        lib_signals_init();
        ret = test_run(tests);

diff --git a/src/lib-program-client/test-program-client-net.c b/src/lib-program-client/test-program-client-net.c
index cdc36789022bdb92959486e28238074c4e2d7664..103e3e4865cf71f5fc032a7603afc755970f18dc 100644 (file)
--- a/src/lib-program-client/test-program-client-net.c
+++ b/src/lib-program-client/test-program-client-net.c
@@ -30,7 +30,7 @@ static const char *pclient_test_io_string =
 static struct program_client_settings pc_set = {
        .client_connect_timeout_msecs = 5000,
        .input_idle_timeout_msecs = 10000,
-       .debug = TRUE,
+       .debug = FALSE,
 };
 
 static struct test_server {
@@ -477,8 +477,10 @@ static void test_program_refused(void)
        test_end();
 }
 
-int main(void)
+int main(int argc, char *argv[])
 {
+       int ret, c;
+
        void (*tests[])(void) = {
                test_program_setup,
                test_program_success,
@@ -490,5 +492,20 @@ int main(void)
                NULL
        };
 
-       return test_run(tests);
+       lib_init();
+
+       while ((c = getopt(argc, argv, "D")) > 0) {
+               switch (c) {
+               case 'D':
+                       pc_set.debug = TRUE;
+                       break;
+               default:
+                       i_fatal("Usage: %s [-D]", argv[0]);
+               }
+       }
+
+       ret = test_run(tests);
+
+       lib_deinit();
+       return ret;
 }

diff --git a/src/lib-program-client/test-program-client-unix.c b/src/lib-program-client/test-program-client-unix.c
index d62028b8600976cc7cb4873a99009ddeb2154b8a..f293f459305d0c2467a34073809bad40ff51dbfe 100644 (file)
--- a/src/lib-program-client/test-program-client-unix.c
+++ b/src/lib-program-client/test-program-client-unix.c
@@ -29,7 +29,7 @@ static const char *pclient_test_io_string =
 static struct program_client_settings pc_set = {
        .client_connect_timeout_msecs = 1000,
        .input_idle_timeout_msecs = 5000,
-       .debug = TRUE,
+       .debug = FALSE,
 };
 
 static struct test_server {
@@ -381,8 +381,10 @@ static void test_program_noreply(void)
        test_end();
 }
 
-int main(void)
+int main(int argc, char *argv[])
 {
+       int ret, c;
+
        void (*tests[])(void) = {
                test_program_setup,
                test_program_success,
@@ -393,5 +395,20 @@ int main(void)
                NULL
        };
 
-       return test_run(tests);
+       lib_init();
+
+       while ((c = getopt(argc, argv, "D")) > 0) {
+               switch (c) {
+               case 'D':
+                       pc_set.debug = TRUE;
+                       break;
+               default:
+                       i_fatal("Usage: %s [-D]", argv[0]);
+               }
+       }
+
+       ret = test_run(tests);
+
+       lib_deinit();
+       return ret;
 }