[libvirt PATCH 240/351] meson: src: add check-symfile test

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
 src/Makefile.am | 11 +----------
 src/meson.build | 12 ++++++++++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 18cc33185a0..0e0fc621e53 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,15 +47,6 @@ include secret/Makefile.inc.am
 include storage/Makefile.inc.am
 
 
-# .libs/libvirt.so is built by libtool as a side-effect of the Makefile
-# rule for libvirt.la.  However, checking symbols relies on Linux ELF layout
-if WITH_LINUX
-check-symfile: libvirt.syms libvirt.la
-	$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symfile.py \
-		libvirt.syms .libs/libvirt.so
-else ! WITH_LINUX
-check-symfile:
-endif ! WITH_LINUX
 check-symsorting:
 	$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symsorting.py \
 		$(srcdir) $(SYM_FILES)
@@ -147,7 +138,7 @@ check-aclperms:
 		$(srcdir)/access/viraccessperm.h \
 		$(srcdir)/access/viraccessperm.c
 
-check-local: check-protocol check-symfile check-symsorting \
+check-local: check-protocol check-symsorting \
 	check-drivername check-driverimpls check-aclrules \
 	check-aclperms check-admin
 .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)
diff --git a/src/meson.build b/src/meson.build
index b8e356d8b0e..0c94483965d 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -790,3 +790,15 @@ virt_install_dirs += [
 ]
 
 meson.add_install_script(install_dirs_prog.path(), virt_install_dirs)
+
+
+# Check driver files
+
+if host_machine.system() == 'linux'
+  test(
+    'check-symfile',
+    python3_prog,
+    args: [ check_symfile_prog.path(), libvirt_syms, libvirt_lib ],
+    env: runutf8,
+  )
+endif
-- 
2.26.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux