diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tests/test-at-serial-port.c | 6 | ||||
| -rw-r--r-- | src/tests/test-charsets.c | 6 | ||||
| -rw-r--r-- | src/tests/test-modem-helpers-qmi.c | 6 | ||||
| -rw-r--r-- | src/tests/test-modem-helpers.c | 6 | ||||
| -rw-r--r-- | src/tests/test-qcdm-serial-port.c | 6 | ||||
| -rw-r--r-- | src/tests/test-sms-part-3gpp.c | 6 | ||||
| -rw-r--r-- | src/tests/test-sms-part-cdma.c | 6 | ||||
| -rw-r--r-- | src/tests/test-udev-rules.c | 9 |
8 files changed, 24 insertions, 27 deletions
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) |