All mock libraries were called vir*mock except for this one; now the naming is consistent across the board. --- tests/Makefile.am | 14 +++++++------- tests/{virmockdbus.c => virdbusmock.c} | 2 +- tests/virfirewalltest.c | 2 +- tests/virpolkittest.c | 2 +- tests/virsystemdtest.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) rename tests/{virmockdbus.c => virdbusmock.c} (97%) diff --git a/tests/Makefile.am b/tests/Makefile.am index 359610f..90981dc 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/virmockdbus.c b/tests/virdbusmock.c similarity index 97% rename from tests/virmockdbus.c rename to tests/virdbusmock.c index 4261e6a..a62689e 100644 --- a/tests/virmockdbus.c +++ b/tests/virdbusmock.c @@ -1,5 +1,5 @@ /* - * virmockdbus.c: mocking of dbus message send/reply + * virdbusmock.c: mocking of dbus message send/reply * * Copyright (C) 2013-2014 Red Hat, Inc. * diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 8f6fc9e..f1f29c6 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/virpolkittest.c b/tests/virpolkittest.c index b39beed..1ef7635 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 101f5e0..5e72de4 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 -- 2.5.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list