From dd2d55ca5701dd3df2c9ae699734cf8054564ffe Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 22 Jan 2018 08:24:39 +0100 Subject: [PATCH] tests: fix test setup after requiring glib 2.40 Also, g_test_expect_message() no longer needs to suppress deprecation warnings. Fixes: 8a46b25cfa8c33daa8af37bb8103ca02286001b1 --- shared/nm-utils/nm-test-utils.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h index d47bb87fab..d7233de20f 100644 --- a/shared/nm-utils/nm-test-utils.h +++ b/shared/nm-utils/nm-test-utils.h @@ -540,8 +540,6 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_ g_assert (success); if (__nmtst_internal.no_expect_message) g_log_set_always_fatal (G_LOG_FATAL_MASK); - /* g_test_expect_message() is a NOP, so allow any messages */ - g_log_set_always_fatal (G_LOG_FATAL_MASK); } else if (__nmtst_internal.no_expect_message) { /* We have a test that would be assert_logging, but the user specified no_expect_message. * This transforms g_test_expect_message() into a NOP, but we also have to relax @@ -637,9 +635,7 @@ nmtst_test_quick (void) if (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message) { \ g_debug ("nmtst: assert-logging: g_test_expect_message %s", G_STRINGIFY ((__VA_ARGS__))); \ } else { \ - G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ g_test_expect_message (__VA_ARGS__); \ - G_GNUC_END_IGNORE_DEPRECATIONS \ } \ } G_STMT_END #undef g_test_assert_expected_messages_internal