From 47503cc85991ed460eeaf114997b6127278ff25f Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 4 Apr 2022 12:22:37 +0200 Subject: [PATCH] test: Link qemuhotplugmock with test_utils_qemu and test_utils MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Ján Tomko --- tests/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = []