From: Daniel P. Berrangé <berrange@redhat.com>
Date: Tue, 7 May 2024 12:23:39 +0000 (+0100)
Subject: tests: build driver modules before virdrivermoduletest
X-Git-Tag: v10.4.0-rc1~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08bfb18736a0dc50068090e1a7a024b7a920f789;p=thirdparty%2Flibvirt.git

tests: build driver modules before virdrivermoduletest

The virdrivermoduletest will attempt to dlopen() each driver module,
so they must be build before the test can run.

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/meson.build b/src/meson.build
index 17e6feafba..dd2682ec19 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -578,6 +578,8 @@ endif
 
 # build libvirt shared modules
 
+virt_module_deps = []
+
 foreach module : virt_modules
   mod = shared_module(
     module['name'],
@@ -607,6 +609,7 @@ foreach module : virt_modules
     install_rpath: libvirt_rpath,
   )
   set_variable('@0@_module'.format(module['name'].underscorify()), mod)
+  virt_module_deps += mod
 endforeach
 
 
diff --git a/tests/meson.build b/tests/meson.build
index f466c4ed2d..6869ed28de 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -375,7 +375,7 @@ if conf.has('WITH_LIBVIRTD')
   tests += [
     { 'name': 'eventtest', 'deps': [ thread_dep ] },
     { 'name': 'virdriverconnvalidatetest' },
-    { 'name': 'virdrivermoduletest' },
+    { 'name': 'virdrivermoduletest', 'depends': virt_module_deps },
   ]
 endif