From 3abeb7f2b9954b1929df58493c47219a7f97ba14 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 27 Mar 2015 12:27:48 +0100 Subject: [PATCH] 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. --- include/nm-test-utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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