diff --git a/src/util/virutil.h b/src/util/virutil.h index ee23f0c1f4..49b4bf440f 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -99,7 +99,7 @@ char *virGetUserDirectory(void); char *virGetUserDirectoryByUID(uid_t uid); char *virGetUserConfigDirectory(void); char *virGetUserCacheDirectory(void); -char *virGetUserRuntimeDirectory(void); +char *virGetUserRuntimeDirectory(void) G_GNUC_NO_INLINE; char *virGetUserShell(uid_t uid); char *virGetUserName(uid_t uid) G_GNUC_NO_INLINE; char *virGetGroupName(gid_t gid) G_GNUC_NO_INLINE; diff --git a/tests/Makefile.am b/tests/Makefile.am index ada5b8fc57..fc516376b4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -212,6 +212,7 @@ test_libraries = libshunload.la \ libvirnetdaemonmock.la \ libvirnetserverclientmock.la \ libvircgroupmock.la \ + libvirhostdevmock.la \ libvirpcimock.la \ libvirnetdevmock.la \ libvirrandommock.la \ @@ -1226,6 +1227,12 @@ libvirfilecachemock_la_SOURCES = \ libvirfilecachemock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) libvirfilecachemock_la_LIBADD = $(MOCKLIBS_LIBS) +libvirhostdevmock_la_SOURCES = \ + virhostdevmock.c \ + $(NULL) +libvirhostdevmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) +libvirhostdevmock_la_LIBADD = $(MOCKLIBS_LIBS) + if WITH_LINUX vircaps2xmltest_SOURCES = \ vircaps2xmltest.c testutils.h testutils.c virfilewrapper.h virfilewrapper.c diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 9a215ab303..cf87de187f 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -900,6 +900,7 @@ mymain(void) } VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("virhostdev"), VIR_TEST_MOCK("virpci"), VIR_TEST_MOCK("domaincaps"), VIR_TEST_MOCK("virprocess"), diff --git a/tests/virhostdevmock.c b/tests/virhostdevmock.c new file mode 100644 index 0000000000..9b0e4dc2b0 --- /dev/null +++ b/tests/virhostdevmock.c @@ -0,0 +1,15 @@ +/* + * Copyright (C) 2020 Red Hat, Inc. + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#include + +#include "virutil.h" + +char * +virGetUserRuntimeDirectory(void) +{ + return g_build_filename(g_getenv("LIBVIRT_FAKE_ROOT_DIR"), + "user-runtime-directory", NULL); +} diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index b6260bd9c1..b0bad683a8 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -628,7 +628,9 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virpci")) +VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("virhostdev"), + VIR_TEST_MOCK("virpci")) #else int main(void)