luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix string test failure on BSDs

Browse Source 
As with `test-printf`, the `vasprintf()` placeholder checks on BSDs
(including macOS) are less strict than on Linux (glibc), so the expected
critical message is not seen.

Change the test to not expect it on BSDs.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Helps: #3187
This commit is contained in:
Philip Withnall 2023-11-27 13:26:51 +00:00
parent 062f1a888e
commit 2c4be841d7
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/tests/string.c
View File

@ -319,6 +319,8 @@ test_string_append_vprintf (void)
string_append_vprintf_va (string, "some %s placeholders", "format"); string_append_vprintf_va (string, "some %s placeholders", "format");
/* vasprintf() placeholder checks on BSDs are less strict, so skip these checks if so */
#if !defined(__APPLE__) && !defined(__FreeBSD__)
if (g_test_undefined ()) if (g_test_undefined ())
{ {
g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
@ -330,6 +332,7 @@ test_string_append_vprintf (void)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
g_test_assert_expected_messages (); g_test_assert_expected_messages ();
} }
#endif
g_assert_cmpstr (string->str, ==, "firsthalfsome format placeholders"); g_assert_cmpstr (string->str, ==, "firsthalfsome format placeholders");