diff options
20 files changed, 60 insertions, 76 deletions
diff --git a/plugins/cinterion/tests/test-modem-helpers-cinterion.c b/plugins/cinterion/tests/test-modem-helpers-cinterion.c index 041736f6..875cf74d 100644 --- a/plugins/cinterion/tests/test-modem-helpers-cinterion.c +++ b/plugins/cinterion/tests/test-modem-helpers-cinterion.c @@ -865,17 +865,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/plugins/huawei/tests/test-modem-helpers-huawei.c b/plugins/huawei/tests/test-modem-helpers-huawei.c index 70c40db2..97b11a88 100644 --- a/plugins/huawei/tests/test-modem-helpers-huawei.c +++ b/plugins/huawei/tests/test-modem-helpers-huawei.c @@ -391,7 +391,6 @@ test_prefmode (void) g_assert (combinations != NULL); g_assert_cmpuint (combinations->len, ==, n_expected_combinations); -#if defined ENABLE_TEST_MESSAGE_TRACES for (j = 0; j < combinations->len; j++) { MMHuaweiPrefmodeCombination *single; gchar *allowed_str; @@ -409,7 +408,6 @@ test_prefmode (void) g_free (allowed_str); g_free (preferred_str); } -#endif for (j = 0; j < combinations->len; j++) { MMHuaweiPrefmodeCombination *single; @@ -629,7 +627,6 @@ test_syscfg (void) g_assert (combinations != NULL); g_assert_cmpuint (combinations->len, ==, n_expected_combinations); -#if defined ENABLE_TEST_MESSAGE_TRACES for (j = 0; j < combinations->len; j++) { MMHuaweiSyscfgCombination *single; gchar *allowed_str; @@ -648,7 +645,6 @@ test_syscfg (void) g_free (allowed_str); g_free (preferred_str); } -#endif for (j = 0; j < combinations->len; j++) { MMHuaweiSyscfgCombination *single; @@ -898,7 +894,6 @@ test_syscfgex (void) g_assert (combinations != NULL); g_assert_cmpuint (combinations->len, ==, n_expected_combinations); -#if defined ENABLE_TEST_MESSAGE_TRACES for (j = 0; j < combinations->len; j++) { MMHuaweiSyscfgexCombination *single; gchar *allowed_str; @@ -916,7 +911,6 @@ test_syscfgex (void) g_free (allowed_str); g_free (preferred_str); } -#endif for (j = 0; j < combinations->len; j++) { MMHuaweiSyscfgexCombination *single; @@ -1280,17 +1274,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/plugins/icera/tests/test-modem-helpers-icera.c b/plugins/icera/tests/test-modem-helpers-icera.c index 3761b029..592b8b24 100644 --- a/plugins/icera/tests/test-modem-helpers-icera.c +++ b/plugins/icera/tests/test-modem-helpers-icera.c @@ -182,17 +182,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/plugins/linktop/tests/test-modem-helpers-linktop.c b/plugins/linktop/tests/test-modem-helpers-linktop.c index 27119bbb..827d044f 100644 --- a/plugins/linktop/tests/test-modem-helpers-linktop.c +++ b/plugins/linktop/tests/test-modem-helpers-linktop.c @@ -25,8 +25,6 @@ #include "mm-modem-helpers.h" #include "mm-modem-helpers-linktop.h" -/* #define ENABLE_TEST_MESSAGE_TRACES */ - /*****************************************************************************/ typedef struct { @@ -68,17 +66,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/plugins/mbm/tests/test-modem-helpers-mbm.c b/plugins/mbm/tests/test-modem-helpers-mbm.c index 8c573af4..cca121b0 100644 --- a/plugins/mbm/tests/test-modem-helpers-mbm.c +++ b/plugins/mbm/tests/test-modem-helpers-mbm.c @@ -28,8 +28,6 @@ #include "mm-modem-helpers.h" #include "mm-modem-helpers-mbm.h" -#define ENABLE_TEST_MESSAGE_TRACES - /*****************************************************************************/ /* Test *E2IPCFG responses */ @@ -262,17 +260,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/plugins/sierra/tests/test-modem-helpers-sierra.c b/plugins/sierra/tests/test-modem-helpers-sierra.c index a53f27e1..629572e4 100644 --- a/plugins/sierra/tests/test-modem-helpers-sierra.c +++ b/plugins/sierra/tests/test-modem-helpers-sierra.c @@ -122,17 +122,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/plugins/telit/tests/test-mm-modem-helpers-telit.c b/plugins/telit/tests/test-mm-modem-helpers-telit.c index f95a97d2..c9c30e57 100644 --- a/plugins/telit/tests/test-mm-modem-helpers-telit.c +++ b/plugins/telit/tests/test-mm-modem-helpers-telit.c @@ -553,17 +553,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/plugins/tests/test-keyfiles.c b/plugins/tests/test-keyfiles.c index 9604643e..c1c740cb 100644 --- a/plugins/tests/test-keyfiles.c +++ b/plugins/tests/test-keyfiles.c @@ -57,17 +57,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/plugins/tests/test-udev-rules.c b/plugins/tests/test-udev-rules.c index 581adcad..f6dc6f41 100644 --- a/plugins/tests/test-udev-rules.c +++ b/plugins/tests/test-udev-rules.c @@ -22,9 +22,6 @@ #define _LIBMM_INSIDE_MM #include <libmm-glib.h> -/* Define symbol to enable test message traces */ -#undef ENABLE_TEST_MESSAGE_TRACES - #include "mm-kernel-device-generic-rules.h" #include "mm-log.h" @@ -133,17 +130,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c b/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c index bf0d3b11..dcd4ab24 100644 --- a/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c +++ b/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c @@ -92,17 +92,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (GTestFixtureFunc) t, NULL) diff --git a/plugins/ublox/tests/test-modem-helpers-ublox.c b/plugins/ublox/tests/test-modem-helpers-ublox.c index 5fad8a73..17a46417 100644 --- a/plugins/ublox/tests/test-modem-helpers-ublox.c +++ b/plugins/ublox/tests/test-modem-helpers-ublox.c @@ -986,17 +986,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/plugins/xmm/tests/test-modem-helpers-xmm.c b/plugins/xmm/tests/test-modem-helpers-xmm.c index 28aea936..b4a8b2b5 100644 --- a/plugins/xmm/tests/test-modem-helpers-xmm.c +++ b/plugins/xmm/tests/test-modem-helpers-xmm.c @@ -760,17 +760,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/src/tests/test-at-serial-port.c b/src/tests/test-at-serial-port.c index 2173f207..5aacba2a 100644 --- a/src/tests/test-at-serial-port.c +++ b/src/tests/test-at-serial-port.c @@ -71,17 +71,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/src/tests/test-charsets.c b/src/tests/test-charsets.c index 79fa2a2b..8c34af5f 100644 --- a/src/tests/test-charsets.c +++ b/src/tests/test-charsets.c @@ -411,17 +411,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/src/tests/test-modem-helpers-qmi.c b/src/tests/test-modem-helpers-qmi.c index f85430c6..d6b491c5 100644 --- a/src/tests/test-modem-helpers-qmi.c +++ b/src/tests/test-modem-helpers-qmi.c @@ -316,17 +316,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c index e0b64615..ea693079 100644 --- a/src/tests/test-modem-helpers.c +++ b/src/tests/test-modem-helpers.c @@ -4425,17 +4425,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (GTestFixtureFunc) t, NULL) diff --git a/src/tests/test-qcdm-serial-port.c b/src/tests/test-qcdm-serial-port.c index ac73a5bf..e6899051 100644 --- a/src/tests/test-qcdm-serial-port.c +++ b/src/tests/test-qcdm-serial-port.c @@ -444,17 +444,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } typedef void (*TCFunc) (TestData *, gconstpointer); diff --git a/src/tests/test-sms-part-3gpp.c b/src/tests/test-sms-part-3gpp.c index 9c67e6b9..d9152405 100644 --- a/src/tests/test-sms-part-3gpp.c +++ b/src/tests/test-sms-part-3gpp.c @@ -847,17 +847,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/src/tests/test-sms-part-cdma.c b/src/tests/test-sms-part-cdma.c index 11988ed1..e1559261 100644 --- a/src/tests/test-sms-part-cdma.c +++ b/src/tests/test-sms-part-cdma.c @@ -511,17 +511,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) diff --git a/src/tests/test-udev-rules.c b/src/tests/test-udev-rules.c index 07e9b8db..3398e419 100644 --- a/src/tests/test-udev-rules.c +++ b/src/tests/test-udev-rules.c @@ -22,9 +22,6 @@ #define _LIBMM_INSIDE_MM #include <libmm-glib.h> -/* Define symbol to enable test message traces */ -#undef ENABLE_TEST_MESSAGE_TRACES - #include "mm-kernel-device-generic-rules.h" #include "mm-log.h" @@ -53,17 +50,17 @@ _mm_log (const char *loc, const char *fmt, ...) { -#if defined ENABLE_TEST_MESSAGE_TRACES - /* Dummy log function */ va_list args; gchar *msg; + if (!g_test_verbose ()) + return; + va_start (args, fmt); msg = g_strdup_vprintf (fmt, args); va_end (args); g_print ("%s\n", msg); g_free (msg); -#endif } int main (int argc, char **argv) |