From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 4 Apr 2022 10:22:37 +0000 (+0200)
Subject: test: Link qemuhotplugmock with test_utils_qemu and test_utils
X-Git-Tag: v8.4.0-rc1~265
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47503cc859;p=thirdparty%2Flibvirt.git

test: Link qemuhotplugmock with test_utils_qemu and test_utils

As of ad81aa8ad07 the qemuhotplugmock.c calls
testQemuPrepareHostBackendChardevOne() which is implemented in
testutilsqemu.c. However, the mock is not linked with
testutilsqemu static library which makes some tools (valgrind
particularly) unhappy because the resulting mock library has
unresolved symbol.

The fix is simple, link mock library with test_utils_qemu_lib and
also with test_utils_lib since testutils.c calls some functions
from testutils.c.

Since these two libraries are declared only after mock_libs[], I
had to move the line that declares qemuhotplugmock after those
two.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tests/meson.build b/tests/meson.build
index 08d2ae67cb..6615111056 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -122,7 +122,6 @@ if conf.has('WITH_QEMU')
   mock_libs += [
     { 'name': 'qemucaps2xmlmock' },
     { 'name': 'qemucpumock' },
-    { 'name': 'qemuhotplugmock' },
     { 'name': 'qemuxml2argvmock' },
     { 'name': 'virhostidmock' },
   ]
@@ -193,6 +192,7 @@ if conf.has('WITH_QEMU')
 
   mock_libs += [
     { 'name': 'qemucapsprobemock', 'link_with': [ test_qemu_driver_lib ] },
+    { 'name': 'qemuhotplugmock', 'link_with': [ test_utils_qemu_lib, test_utils_lib ] },
   ]
 else
   test_qemu_driver_lib = []