From: Laine Stump <[email protected]>

The same functionality has been achieved by setting the
XDG_RUNTIME_DIR environment variable during the setup of the "fake
root" directory in testutils.c

Signed-off-by: Laine Stump <[email protected]>
---
 tests/meson.build       |  1 -
 tests/qemuhotplugtest.c |  1 -
 tests/virhostdevmock.c  | 15 ---------------
 tests/virhostdevtest.c  |  1 -
 4 files changed, 18 deletions(-)
 delete mode 100644 tests/virhostdevmock.c

diff --git a/tests/meson.build b/tests/meson.build
index b28ad4a65b..847538d2e4 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -78,7 +78,6 @@ mock_libs = [
   { 'name': 'virfilecachemock' },
   { 'name': 'virfirewallmock' },
   { 'name': 'virhostcpumock' },
-  { 'name': 'virhostdevmock' },
   { 'name': 'virnetdaemonmock' },
   { 'name': 'virnetdevmock' },
   { 'name': 'virnetserverclientmock' },
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 58413b6e0d..0cd738ae3d 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -799,7 +799,6 @@ 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
deleted file mode 100644
index 9b0e4dc2b0..0000000000
--- a/tests/virhostdevmock.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (C) 2020 Red Hat, Inc.
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#include <config.h>
-
-#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 b0fb94e197..d52d549feb 100644
--- a/tests/virhostdevtest.c
+++ b/tests/virhostdevtest.c
@@ -613,7 +613,6 @@ mymain(void)
 }
 
 VIR_TEST_MAIN_PRELOAD(mymain,
-                      VIR_TEST_MOCK("virhostdev"),
                       VIR_TEST_MOCK("virpci"))
 #else
 int
-- 
2.52.0

Reply via email to