From ad5b0a8e6721f3653692098ff910d3b03cf924d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0imerda?= Date: Fri, 26 Jul 2013 14:25:47 +0200 Subject: [PATCH] platform: more logging for tests --- src/platform/tests/test-common.c | 3 +++ src/platform/tests/test-common.h | 2 ++ src/platform/tests/test-link.c | 5 ++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index 6cd8eb312..fc8a60804 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -19,6 +19,7 @@ add_signal_full (const char *name, GCallback callback, int ifindex, const char * void accept_signal (SignalData *data) { + debug ("Accepting signal '%s' ifindex %d ifname %s.", data->name, data->ifindex, data->ifname); if (!data->received) g_error ("Attemted to accept a non-received signal '%s'.", data->name); @@ -55,7 +56,9 @@ run_command (const char *format, ...) va_start (ap, format); command = g_strdup_vprintf (format, ap); + debug ("Running command: %s", command); g_assert (!system (command)); + debug ("Command finished."); g_free (command); } diff --git a/src/platform/tests/test-common.h b/src/platform/tests/test-common.h index 09b41c7ed..31f20cdb8 100644 --- a/src/platform/tests/test-common.h +++ b/src/platform/tests/test-common.h @@ -9,6 +9,8 @@ #include "nm-fake-platform.h" #include "nm-linux-platform.h" +#define debug(...) nm_log_dbg (LOGD_PLATFORM, __VA_ARGS__) + #define error(err) g_assert (nm_platform_get_error () == err) #define no_error() error (NM_PLATFORM_ERROR_NONE) diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index 1885f4992..623e82485 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -30,12 +30,15 @@ link_callback (NMPlatform *platform, int ifindex, NMPlatformLink *received, Sign if (data->ifname && g_strcmp0 (data->ifname, nm_platform_link_get_name (ifindex)) != 0) return; - if (data->loop) + if (data->loop) { + debug ("Quitting main loop."); g_main_loop_quit (data->loop); + } if (data->received) g_error ("Received signal '%s' a second time.", data->name); + debug ("Recieved signal '%s' ifindex %d ifname '%s'.", data->name, ifindex, received->name); data->received = TRUE; /* Check the data */