From 87f2b92da3b6775dfb21fa2973c28c31a31edcdd Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 4 Dec 2014 17:55:44 +0100 Subject: [PATCH] libnm-util/tests: fix invalid g_test_expect_message() pattern A failure to g_return_*() prints a critical warning which contains G_STRFUNC. Depending on the compiler this contains only the function name or the entire signature. Relax the assertion pattern to check the function name. --- libnm-util/tests/test-general.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c index 1d1f84eb43..f748fcf595 100644 --- a/libnm-util/tests/test-general.c +++ b/libnm-util/tests/test-general.c @@ -2519,12 +2519,12 @@ test_nm_utils_uuid_generate_from_string (void) _test_uuid ("098f6bcd-4621-d373-cade-4e832627b4f6", "test"); _test_uuid ("59c0547b-7fe2-1c15-2cce-e328e8bf6742", "/etc/NetworkManager/system-connections/em1"); - g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*char *nm_utils_uuid_generate_from_string(const char *): *s && *s*"); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*nm_utils_uuid_generate_from_string*: *s && *s*"); uuid_test = nm_utils_uuid_generate_from_string (""); g_assert (uuid_test == NULL); g_test_assert_expected_messages (); - g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*char *nm_utils_uuid_generate_from_string(const char *): *s && *s*"); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*nm_utils_uuid_generate_from_string*: *s && *s*"); uuid_test = nm_utils_uuid_generate_from_string (NULL); g_assert (uuid_test == NULL); g_test_assert_expected_messages ();