From: Andrea Bolognani Date: Thu, 11 Feb 2016 13:08:11 +0000 (+0100) Subject: tests: Rename virmockdbus -> virdbusmock for consistency X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=92ec2e5e9b79b7df4d575040224bd606ab0b6dd8;p=libvirt.git tests: Rename virmockdbus -> virdbusmock for consistency All mock libraries were called vir*mock except for this one; now the naming is consistent across the board. --- diff --git a/tests/Makefile.am b/tests/Makefile.am index 359610f1b6..90981dcf31 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -435,7 +435,7 @@ endif WITH_BHYVE if WITH_DBUS test_libraries += \ - virmockdbus.la + virdbusmock.la endif WITH_DBUS if WITH_LINUX @@ -1114,11 +1114,11 @@ virdbustest_SOURCES = \ virdbustest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) virdbustest_LDADD = $(LDADDS) $(DBUS_LIBS) -virmockdbus_la_SOURCES = \ - virmockdbus.c -virmockdbus_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -virmockdbus_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) -virmockdbus_la_LIBADD = $(MOCKLIBS_LIBS) +virdbusmock_la_SOURCES = \ + virdbusmock.c +virdbusmock_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) +virdbusmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) +virdbusmock_la_LIBADD = $(MOCKLIBS_LIBS) virpolkittest_SOURCES = \ virpolkittest.c testutils.h testutils.c @@ -1131,7 +1131,7 @@ virsystemdtest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) virsystemdtest_LDADD = $(LDADDS) $(DBUS_LIBS) else ! WITH_DBUS -EXTRA_DIST += virdbustest.c virmockdbus.c virsystemdtest.c +EXTRA_DIST += virdbustest.c virdbusmock.c virsystemdtest.c endif ! WITH_DBUS viruritest_SOURCES = \ diff --git a/tests/virdbusmock.c b/tests/virdbusmock.c new file mode 100644 index 0000000000..a62689e91d --- /dev/null +++ b/tests/virdbusmock.c @@ -0,0 +1,64 @@ +/* + * virdbusmock.c: mocking of dbus message send/reply + * + * Copyright (C) 2013-2014 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + * + * Author: Daniel P. Berrange + */ + +#include + +#if defined(WITH_DBUS) && !defined(WIN32) +# include "virmock.h" +# include + +VIR_MOCK_STUB_VOID_ARGS(dbus_connection_set_change_sigpipe, + dbus_bool_t, will_modify_sigpipe) + + +VIR_MOCK_STUB_RET_ARGS(dbus_bus_get, + DBusConnection *, (DBusConnection *)0x1, + DBusBusType, type, + DBusError *, error) + +VIR_MOCK_STUB_VOID_ARGS(dbus_connection_set_exit_on_disconnect, + DBusConnection *, connection, + dbus_bool_t, exit_on_disconnect) + +VIR_MOCK_STUB_RET_ARGS(dbus_connection_set_watch_functions, + dbus_bool_t, 1, + DBusConnection *, connection, + DBusAddWatchFunction, add_function, + DBusRemoveWatchFunction, remove_function, + DBusWatchToggledFunction, toggled_function, + void *, data, + DBusFreeFunction, free_data_function) + +VIR_MOCK_STUB_RET_ARGS(dbus_message_set_reply_serial, + dbus_bool_t, 1, + DBusMessage *, message, + dbus_uint32_t, serial) + + +VIR_MOCK_LINK_RET_ARGS(dbus_connection_send_with_reply_and_block, + DBusMessage *, + DBusConnection *, connection, + DBusMessage *, message, + int, timeout_milliseconds, + DBusError *, error) + +#endif /* WITH_DBUS && !WIN32 */ diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 8f6fc9e12d..f1f29c6d39 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -1184,7 +1184,7 @@ mymain(void) } # if WITH_DBUS -VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmockdbus.so") +VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so") # else VIRT_TEST_MAIN(mymain) # endif diff --git a/tests/virmockdbus.c b/tests/virmockdbus.c deleted file mode 100644 index 4261e6abb4..0000000000 --- a/tests/virmockdbus.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * virmockdbus.c: mocking of dbus message send/reply - * - * Copyright (C) 2013-2014 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * . - * - * Author: Daniel P. Berrange - */ - -#include - -#if defined(WITH_DBUS) && !defined(WIN32) -# include "virmock.h" -# include - -VIR_MOCK_STUB_VOID_ARGS(dbus_connection_set_change_sigpipe, - dbus_bool_t, will_modify_sigpipe) - - -VIR_MOCK_STUB_RET_ARGS(dbus_bus_get, - DBusConnection *, (DBusConnection *)0x1, - DBusBusType, type, - DBusError *, error) - -VIR_MOCK_STUB_VOID_ARGS(dbus_connection_set_exit_on_disconnect, - DBusConnection *, connection, - dbus_bool_t, exit_on_disconnect) - -VIR_MOCK_STUB_RET_ARGS(dbus_connection_set_watch_functions, - dbus_bool_t, 1, - DBusConnection *, connection, - DBusAddWatchFunction, add_function, - DBusRemoveWatchFunction, remove_function, - DBusWatchToggledFunction, toggled_function, - void *, data, - DBusFreeFunction, free_data_function) - -VIR_MOCK_STUB_RET_ARGS(dbus_message_set_reply_serial, - dbus_bool_t, 1, - DBusMessage *, message, - dbus_uint32_t, serial) - - -VIR_MOCK_LINK_RET_ARGS(dbus_connection_send_with_reply_and_block, - DBusMessage *, - DBusConnection *, connection, - DBusMessage *, message, - int, timeout_milliseconds, - DBusError *, error) - -#endif /* WITH_DBUS && !WIN32 */ diff --git a/tests/virpolkittest.c b/tests/virpolkittest.c index b39beedf14..1ef7635fd8 100644 --- a/tests/virpolkittest.c +++ b/tests/virpolkittest.c @@ -349,7 +349,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmockdbus.so") +VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so") #else /* ! (WITH_DBUS && __linux__) */ int diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 101f5e049f..5e72de4663 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -602,7 +602,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmockdbus.so") +VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so") #else /* ! (WITH_DBUS && __linux__) */ int