NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

tests: work with older dbus

Browse Source 
On RHEL 5, with dbus 1.1.2, compilation failed with:

virsystemdmock.c: In function 'dbus_connection_send_with_reply_and_block':
virsystemdmock.c:68: warning: implicit declaration of function 'dbus_message_set_serial'

Fix this by instead bypassing all attempts to use a dbus serial.

* tests/virsystemdmock.c (dbus_message_set_reply_serial): Add new
override.
(dbus_connection_send_with_reply_and_block): No longer bother with
the serial.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2013-08-08 13:00:03 -06:00
parent 26b8a4dd23
commit edfae3dccf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/virsystemdmock.c
View File

@ -58,6 +58,12 @@ dbus_bool_t dbus_connection_set_watch_functions(DBusConnection *connection ATTRI
return 1; return 1;
} }
dbus_bool_t dbus_message_set_reply_serial(DBusMessage *message ATTRIBUTE_UNUSED,
dbus_uint32_t serial ATTRIBUTE_UNUSED)
{
return 1;
}
DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connection ATTRIBUTE_UNUSED,
DBusMessage *message, DBusMessage *message,
int timeout_milliseconds ATTRIBUTE_UNUSED, int timeout_milliseconds ATTRIBUTE_UNUSED,
@ -65,8 +71,6 @@ DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connectio
{ {
DBusMessage *reply = NULL; DBusMessage *reply = NULL;
dbus_message_set_serial(message, 7);
if (getenv("FAIL_BAD_SERVICE")) if (getenv("FAIL_BAD_SERVICE"))
reply = dbus_message_new_error(message, reply = dbus_message_new_error(message,
"org.freedesktop.systemd.badthing", "org.freedesktop.systemd.badthing",