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

tests/logging: Don't hardcode the result of logging a pointer

Browse Source 
The output of the %p type is implementation defined and on Windows we get
leading zeros depending on the pointer type size. Instead of adding
ifdeffery use g_snprintf() to generate the expected message.

https://bugzilla.gnome.org/show_bug.cgi?id=795569
This commit is contained in:
Christoph Reiter 2018-05-10 19:17:12 +02:00 committed by Christoph Reiter
parent 1a6be02260
commit 3e5477b04b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glib/tests/logging.c
View File

@ -428,15 +428,22 @@ test_structured_logging_roundtrip1 (void)
{ {
gpointer some_pointer = GUINT_TO_POINTER (0x100); gpointer some_pointer = GUINT_TO_POINTER (0x100);
gint some_integer = 123; gint some_integer = 123;
const GLogField fields[] = { gchar message[200];
GLogField fields[] = {
{ "GLIB_DOMAIN", "some-domain", -1 }, { "GLIB_DOMAIN", "some-domain", -1 },
{ "PRIORITY", "5", -1 }, { "PRIORITY", "5", -1 },
{ "MESSAGE", "This is a debug message about pointer 0x100 and integer 123.", -1 }, { "MESSAGE", "String assigned using g_snprintf() below", -1 },
{ "MESSAGE_ID", "fcfb2e1e65c3494386b74878f1abf893", -1 }, { "MESSAGE_ID", "fcfb2e1e65c3494386b74878f1abf893", -1 },
{ "MY_APPLICATION_CUSTOM_FIELD", "some debug string", -1 } { "MY_APPLICATION_CUSTOM_FIELD", "some debug string", -1 }
}; };
ExpectedMessage expected = { fields, 5 }; ExpectedMessage expected = { fields, 5 };
/* %p format is implementation defined and depends on the platform */
g_snprintf (message, sizeof (message),
"This is a debug message about pointer %p and integer %u.",
some_pointer, some_integer);
fields[2].value = message;
expected_messages = g_slist_append (NULL, &expected); expected_messages = g_slist_append (NULL, &expected);
g_log_set_writer_func (expect_log_writer, NULL, NULL); g_log_set_writer_func (expect_log_writer, NULL, NULL);