summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-03-27 12:27:48 +0100
committerThomas Haller <thaller@redhat.com>2015-04-08 14:39:16 +0200
commit3abeb7f2b9954b1929df58493c47219a7f97ba14 (patch)
tree0ea6518f52a4e5e1ada90051313f1e1fc9553847 /include
parent0a2c0d12e83194047196e091effc8849f2aa7948 (diff)
downloadNetworkManager-3abeb7f2b9954b1929df58493c47219a7f97ba14.tar.gz
test: fix enabling DEBUG logging for tests
For glog messages to print any debug messages, we must set G_MESSAGES_DEBUG. nmtst does this for us if we set @is_debug. But fix the condition to also set G_MESSAGES_DEBUG if set set c_log_level to DEBUG or TRACE.
Diffstat (limited to 'include')
-rw-r--r--include/nm-test-utils.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h
index ef1d565ca3..79fb3b48be 100644
--- a/include/nm-test-utils.h
+++ b/include/nm-test-utils.h
@@ -306,7 +306,7 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
}
if ((!__nmtst_internal.assert_logging || (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message)) &&
- (is_debug || (log_level && !g_ascii_strcasecmp (log_level, "DEBUG"))) &&
+ (is_debug || (c_log_level && (!g_ascii_strcasecmp (c_log_level, "DEBUG") || !g_ascii_strcasecmp (c_log_level, "TRACE")))) &&
!g_getenv ("G_MESSAGES_DEBUG"))
{
/* if we are @is_debug or @log_level=="DEBUG" and