diff options
Diffstat (limited to 'src/libnm-glib-aux')
| -rw-r--r-- | src/libnm-glib-aux/nm-macros-internal.h | 12 | ||||
| -rw-r--r-- | src/libnm-glib-aux/nm-test-utils.h | 11 |
2 files changed, 17 insertions, 6 deletions
diff --git a/src/libnm-glib-aux/nm-macros-internal.h b/src/libnm-glib-aux/nm-macros-internal.h index 71a17e3e..0534ee5d 100644 --- a/src/libnm-glib-aux/nm-macros-internal.h +++ b/src/libnm-glib-aux/nm-macros-internal.h @@ -529,12 +529,12 @@ nm_str_realloc(char *str) /* redefine assertions to use g_assert*() */ #undef _nm_assert_fail -#define _nm_assert_fail(msg) \ - G_STMT_START \ - { \ - g_assertion_message_expr(G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); \ - _nm_unreachable_code(); \ - } \ +#define _nm_assert_fail(msg) \ + G_STMT_START \ + { \ + g_assertion_message_expr(G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, "" msg ""); \ + _nm_unreachable_code(); \ + } \ G_STMT_END #undef _NM_ASSERT_FAIL_ENABLED diff --git a/src/libnm-glib-aux/nm-test-utils.h b/src/libnm-glib-aux/nm-test-utils.h index 41e1a6ce..b65818e0 100644 --- a/src/libnm-glib-aux/nm-test-utils.h +++ b/src/libnm-glib-aux/nm-test-utils.h @@ -846,6 +846,17 @@ nmtst_test_skip_slow(void) #define NMTST_EXPECT_LIBNM_WARNING(msg) NMTST_EXPECT_LIBNM(G_LOG_LEVEL_WARNING, msg) #define NMTST_EXPECT_LIBNM_CRITICAL(msg) NMTST_EXPECT_LIBNM(G_LOG_LEVEL_CRITICAL, msg) +/* Commit [1] changed the level in which glib emits certain assertions. + * As we have test that check for those assertions (g_test_expect_message()), + * we need to choose the right one. + * + * [1] https://gitlab.gnome.org/GNOME/glib/-/commit/0ffe86a1f7e215e4561c3b9f1d03c3cd638ed00f */ +#if GLIB_CHECK_VERSION(2, 75, 0) +#define NMTST_EXPECT_GOBJECT_ASSERT_LEVEL G_LOG_LEVEL_CRITICAL +#else +#define NMTST_EXPECT_GOBJECT_ASSERT_LEVEL G_LOG_LEVEL_WARNING +#endif + /*****************************************************************************/ typedef struct _NmtstTestData NmtstTestData; |