From 45dd26ece28f0616562ef6d0aa95679ec6bc43b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 11 Jan 2021 14:38:59 +0000 Subject: [PATCH] src: add missing COMMON_CFLAGS to libvirt_viewer_util.la MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ensures that G_LOG_DOMAIN is used in all places, and in turns highlights a bug in the test suite. Signed-off-by: Daniel P. Berrangé --- src/Makefile.am | 1 + tests/test-monitor-alignment.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4dbc03f..667b662 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -153,6 +153,7 @@ libvirt_viewer_util_la_LIBADD = \ libvirt_viewer_util_la_CFLAGS = \ -DLOCALE_DIR=\""$(datadir)/locale"\" \ + $(COMMON_CFLAGS) \ $(GLIB2_CFLAGS) \ $(GTK_CFLAGS) \ $(LIBXML2_CFLAGS) \ diff --git a/tests/test-monitor-alignment.c b/tests/test-monitor-alignment.c index 522483f..30e4d3c 100644 --- a/tests/test-monitor-alignment.c +++ b/tests/test-monitor-alignment.c @@ -65,7 +65,7 @@ test_monitor_align(MonitorAlignFunc monitor_align, const TestCase *test_cases, c g_hash_table_insert(displays, GUINT_TO_POINTER(j), displays_in[j]); } for (j = 0; j < G_N_ELEMENTS(test_cases[i].messages) && test_cases[i].messages[j]; j++) { - g_test_expect_message(NULL, test_cases[i].log_level, test_cases[i].messages[j]); + g_test_expect_message(G_LOG_DOMAIN, test_cases[i].log_level, test_cases[i].messages[j]); } monitor_align(displays); g_test_assert_expected_messages();