Attachment 106814 Details for Bug 83968 – Fix test suite fails on test-dbus with enabled-tests

[patch] Fix test suite fails on test-dbus with enabled-tests

0001-Fix-test-suite-fails-on-test-dbus-with-enable-tests-.patch (text/plain), 1.77 KB, created by Ralf Habacker on 2014-09-24 21:24:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2014-09-24 21:24:59 UTC

Size: 1.77 KB

patch

obsolete

>From ca5f8776ceba3c0ceac64a0811b291f869b3fd26 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Wed, 24 Sep 2014 23:23:31 +0200
>Subject: [PATCH] Fix test suite fails on test-dbus with --enable-tests (but no
> assertions).
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83968
>---
> dbus/dbus-message-util.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
>diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c
>index f615af8..5266b01 100644
>--- a/dbus/dbus-message-util.c
>+++ b/dbus/dbus-message-util.c
>@@ -1205,6 +1205,7 @@ _dbus_message_test (const char *test_data_dir)
> #endif
>   char **decomposed;
>   DBusInitialFDs *initial_fds;
>+  dbus_bool_t ok;
> 
>   initial_fds = _dbus_check_fdleaks_enter ();
> 
>@@ -1603,18 +1604,19 @@ _dbus_message_test (const char *test_data_dir)
> 
>   dbus_message_iter_init_append (message, &iter);
> 
>-  _dbus_assert (dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY,
>+  ok = dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY,
> 			  			  (DBUS_STRUCT_BEGIN_CHAR_AS_STRING
> 						   DBUS_TYPE_STRING_AS_STRING
> 						   DBUS_TYPE_STRING_AS_STRING
> 						   DBUS_STRUCT_END_CHAR_AS_STRING),
>-						  &array_iter));
>-  _dbus_assert (dbus_message_iter_open_container (&array_iter, DBUS_TYPE_STRUCT,
>-			  			  NULL, &struct_iter));
>-
>+                          &array_iter);
>+  _dbus_assert (ok);
>+  ok = dbus_message_iter_open_container (&array_iter, DBUS_TYPE_STRUCT,
>+                          NULL, &struct_iter);
>+  _dbus_assert (ok);
>   s = "peaches";
>-  _dbus_assert (dbus_message_iter_append_basic (&struct_iter, DBUS_TYPE_STRING,
>-			  			&s));
>+  ok = dbus_message_iter_append_basic (&struct_iter, DBUS_TYPE_STRING, &s);
>+  _dbus_assert (ok);
> 
>   /* uh-oh, error, try and unwind */
> 
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 83968: 106499 | 106814

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.