From 6011a022d9e4d88d4bd54acb4dab1f05a31428a5 Mon Sep 17 00:00:00 2001 From: "12:41:26 Tim Janik" Date: Fri, 15 Aug 2008 10:44:57 +0000 Subject: [PATCH] changed assertion messages, so older emacsen can also detect failing MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-08-15 12:41:26 Tim Janik * glib/gtestutils.c: changed assertion messages, so older emacsen can also detect failing source file and line, fixes: Bug 502498 – Test framework assertion failures should follow gcc error format svn path=/trunk/; revision=7358 --- ChangeLog | 6 ++++++ glib/gtestutils.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73740d8..ef51ae1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-15 12:41:26 Tim Janik + + * glib/gtestutils.c: changed assertion messages, so older emacsen + can also detect failing source file and line, fixes: + Bug 502498 – Test framework assertion failures should follow gcc error format + 2008-08-14 Matthias Clasen Bug 547832 – gtk+-2.12.11 fails to build - AC_PROG_MMAP too strict, diff --git a/glib/gtestutils.c b/glib/gtestutils.c index b042714..8c0eb1f 100644 --- a/glib/gtestutils.c +++ b/glib/gtestutils.c @@ -1267,10 +1267,10 @@ g_assertion_message (const char *domain, message = "code should not be reached"; g_snprintf (lstr, 32, "%d", line); s = g_strconcat (domain ? domain : "", domain && domain[0] ? ":" : "", - "ERROR:(", file, ":", lstr, "):", + "ERROR:", file, ":", lstr, ":", func, func[0] ? ":" : "", " ", message, NULL); - g_printerr ("**\n** %s\n", s); + g_printerr ("**\n%s\n", s); g_test_log (G_TEST_LOG_ERROR, s, NULL, 0, NULL); g_free (s); abort(); -- 2.7.4