Every other mock library is named ending in mock.c, move virmocklibxl.c to follow that pattern Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx> --- tests/Makefile.am | 12 ++++++------ tests/{virmocklibxl.c => libxlmock.c} | 2 +- tests/libxlxml2domconfigtest.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) rename tests/{virmocklibxl.c => libxlmock.c} (98%) diff --git a/tests/Makefile.am b/tests/Makefile.am index ceb15d9218..c9f79a4e7d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -278,7 +278,7 @@ ssh_LDADD = $(COVERAGE_LDFLAGS) if WITH_LIBXL test_programs += xlconfigtest xml2sexprtest sexpr2xmltest \ xmconfigtest libxlxml2domconfigtest -test_libraries += virmocklibxl.la +test_libraries += libxlmock.la endif WITH_LIBXL if WITH_QEMU @@ -534,11 +534,11 @@ libxlxml2domconfigtest_SOURCES = \ testutils.c testutils.h libxlxml2domconfigtest_LDADD = $(libxl_LDADDS) $(LIBXML_LIBS) -virmocklibxl_la_SOURCES = \ - virmocklibxl.c -virmocklibxl_la_CFLAGS = $(LIBXL_CFLAGS) $(LIBXML_CFLAGS) -virmocklibxl_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) -virmocklibxl_la_LIBADD = $(MOCKLIBS_LIBS) +libxlmock_la_SOURCES = \ + libxlmock.c +libxlmock_la_CFLAGS = $(LIBXL_CFLAGS) $(LIBXML_CFLAGS) +libxlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) +libxlmock_la_LIBADD = $(MOCKLIBS_LIBS) else ! WITH_LIBXL EXTRA_DIST += xlconfigtest.c xml2sexprtest.c sexpr2xmltest.c \ diff --git a/tests/virmocklibxl.c b/tests/libxlmock.c similarity index 98% rename from tests/virmocklibxl.c rename to tests/libxlmock.c index 7664f007ac..4476cf728f 100644 --- a/tests/virmocklibxl.c +++ b/tests/libxlmock.c @@ -1,5 +1,5 @@ /* - * virmocklibxl.c: mocking of xenstore/libxs for libxl + * libxlmock.c: mocking of xenstore/libxs for libxl * * Copyright (C) 2014 Red Hat, Inc. * diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index de6e86ec66..863d8cded5 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -223,7 +223,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmocklibxl.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libxlmock.so") #else -- 2.20.1