fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 10:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: fix test setup after requiring glib 2.40

Browse source 
Also, g_test_expect_message() no longer needs to suppress
deprecation warnings.

Fixes: 8a46b25cfa
This commit is contained in:
Thomas Haller 2018-01-22 08:24:39 +01:00
parent 22f32a16f5
commit dd2d55ca57
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shared/nm-utils/nm-test-utils.h
View file

@ -540,8 +540,6 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
g_assert (success); g_assert (success);
if (__nmtst_internal.no_expect_message) if (__nmtst_internal.no_expect_message)
g_log_set_always_fatal (G_LOG_FATAL_MASK); 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) { } else if (__nmtst_internal.no_expect_message) {
/* We have a test that would be assert_logging, but the user specified 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 * 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) { \ if (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message) { \
g_debug ("nmtst: assert-logging: g_test_expect_message %s", G_STRINGIFY ((__VA_ARGS__))); \ g_debug ("nmtst: assert-logging: g_test_expect_message %s", G_STRINGIFY ((__VA_ARGS__))); \
} else { \ } else { \
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
g_test_expect_message (__VA_ARGS__); \ g_test_expect_message (__VA_ARGS__); \
G_GNUC_END_IGNORE_DEPRECATIONS \
} \ } \
} G_STMT_END } G_STMT_END
#undef g_test_assert_expected_messages_internal #undef g_test_assert_expected_messages_internal