提交 92ec2e5e 编写于 作者: A Andrea Bolognani

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.
上级 f6d6d21f
...@@ -435,7 +435,7 @@ endif WITH_BHYVE ...@@ -435,7 +435,7 @@ endif WITH_BHYVE
if WITH_DBUS if WITH_DBUS
test_libraries += \ test_libraries += \
virmockdbus.la virdbusmock.la
endif WITH_DBUS endif WITH_DBUS
if WITH_LINUX if WITH_LINUX
...@@ -1114,11 +1114,11 @@ virdbustest_SOURCES = \ ...@@ -1114,11 +1114,11 @@ virdbustest_SOURCES = \
virdbustest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) virdbustest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
virdbustest_LDADD = $(LDADDS) $(DBUS_LIBS) virdbustest_LDADD = $(LDADDS) $(DBUS_LIBS)
virmockdbus_la_SOURCES = \ virdbusmock_la_SOURCES = \
virmockdbus.c virdbusmock.c
virmockdbus_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) virdbusmock_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
virmockdbus_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virdbusmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
virmockdbus_la_LIBADD = $(MOCKLIBS_LIBS) virdbusmock_la_LIBADD = $(MOCKLIBS_LIBS)
virpolkittest_SOURCES = \ virpolkittest_SOURCES = \
virpolkittest.c testutils.h testutils.c virpolkittest.c testutils.h testutils.c
...@@ -1131,7 +1131,7 @@ virsystemdtest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) ...@@ -1131,7 +1131,7 @@ virsystemdtest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
virsystemdtest_LDADD = $(LDADDS) $(DBUS_LIBS) virsystemdtest_LDADD = $(LDADDS) $(DBUS_LIBS)
else ! WITH_DBUS else ! WITH_DBUS
EXTRA_DIST += virdbustest.c virmockdbus.c virsystemdtest.c EXTRA_DIST += virdbustest.c virdbusmock.c virsystemdtest.c
endif ! WITH_DBUS endif ! WITH_DBUS
viruritest_SOURCES = \ viruritest_SOURCES = \
......
/* /*
* virmockdbus.c: mocking of dbus message send/reply * virdbusmock.c: mocking of dbus message send/reply
* *
* Copyright (C) 2013-2014 Red Hat, Inc. * Copyright (C) 2013-2014 Red Hat, Inc.
* *
......
...@@ -1184,7 +1184,7 @@ mymain(void) ...@@ -1184,7 +1184,7 @@ mymain(void)
} }
# if WITH_DBUS # if WITH_DBUS
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmockdbus.so") VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so")
# else # else
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
# endif # endif
......
...@@ -349,7 +349,7 @@ mymain(void) ...@@ -349,7 +349,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; 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__) */ #else /* ! (WITH_DBUS && __linux__) */
int int
......
...@@ -602,7 +602,7 @@ mymain(void) ...@@ -602,7 +602,7 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; 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__) */ #else /* ! (WITH_DBUS && __linux__) */
int int
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册