From 215c04ce6cbba846974175ca8f981669977dc1cc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 31 Oct 2008 09:56:19 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20558513=20=E2=80=93=20g=5Fwarn=5Fif=5Ffail?= =?UTF-8?q?=20FIXME=20in=20gtestutils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * glib/gtestutils.c (g_test_log_send): Turn g_assert into g_warn_if_fail as advised svn path=/trunk/; revision=7637 --- ChangeLog | 7 +++++++ glib/gtestutils.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55a5677d7..92a159d19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-31 Christian Dywan + + Bug 558513 – g_warn_if_fail FIXME in gtestutils + + * glib/gtestutils.c (g_test_log_send): + Turn g_assert into g_warn_if_fail as advised + 2008-10-31 Grahame Bowland Bug 558185 – 'parent' variable in g_local_file_get_child_for_display_name() diff --git a/glib/gtestutils.c b/glib/gtestutils.c index d4be2c88c..895eca985 100644 --- a/glib/gtestutils.c +++ b/glib/gtestutils.c @@ -140,13 +140,13 @@ g_test_log_send (guint n_bytes, } if (test_debug_log) { - GTestLogBuffer *lbuffer = g_test_log_buffer_new(); + GTestLogBuffer *lbuffer = g_test_log_buffer_new (); GTestLogMsg *msg; guint ui; g_test_log_buffer_push (lbuffer, n_bytes, buffer); msg = g_test_log_buffer_pop (lbuffer); - g_assert (msg != NULL); /* FIXME: should be g_awrn_if_fail */ - g_assert (lbuffer->data->len == 0); /* FIXME: should be g_awrn_if_fail */ + g_warn_if_fail (msg != NULL); + g_warn_if_fail (lbuffer->data->len == 0); g_test_log_buffer_free (lbuffer); /* print message */ g_printerr ("{*LOG(%s)", g_test_log_type_name (msg->log_type));