diff options
Diffstat (limited to 'shared/nm-test-utils.h')
| -rw-r--r-- | shared/nm-test-utils.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/shared/nm-test-utils.h b/shared/nm-test-utils.h index 471bf73d81..83e1f47e47 100644 --- a/shared/nm-test-utils.h +++ b/shared/nm-test-utils.h @@ -92,6 +92,11 @@ #include "nm-default.h" +#if NM_ASSERT_NO_MSG +#undef g_return_if_fail_warning +#undef g_assertion_message_expr +#endif + #include <arpa/inet.h> #include <stdio.h> #include <unistd.h> @@ -103,7 +108,7 @@ /*******************************************************************************/ -#define NMTST_G_RETURN_MSG_S(expr) "*: assertion '"expr"' failed" +#define NMTST_G_RETURN_MSG_S(expr) "*: assertion '"NM_ASSERT_G_RETURN_EXPR(expr)"' failed" #define NMTST_G_RETURN_MSG(expr) NMTST_G_RETURN_MSG_S(#expr) /*******************************************************************************/ |