Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
src/Makefile.am | 21 +--------------------
src/meson.build | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 11fb9122631..e5d338409dc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -99,25 +99,6 @@ else !WITH_REMOTE
check-protocol:
endif !WITH_REMOTE
-DRIVERS = \
- $(srcdir)/driver-hypervisor.h \
- $(srcdir)/driver-interface.h \
- $(srcdir)/driver-network.h \
- $(srcdir)/driver-nodedev.h \
- $(srcdir)/driver-nwfilter.h \
- $(srcdir)/driver-secret.h \
- $(srcdir)/driver-state.h \
- $(srcdir)/driver-storage.h \
- $(srcdir)/driver-stream.h \
- $(NULL)
-
-check-drivername:
- $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-drivername.py \
- $(DRIVERS) \
- $(srcdir)/libvirt_public.syms \
- $(srcdir)/libvirt_qemu.syms \
- $(srcdir)/libvirt_lxc.syms
-
check-driverimpls:
$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-driverimpls.py \
$(DRIVER_SOURCE_FILES)
@@ -133,7 +114,7 @@ check-aclperms:
$(srcdir)/access/viraccessperm.c
check-local: check-protocol \
- check-drivername check-driverimpls check-aclrules \
+ 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 21d4b9aa412..5fb90f61687 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -269,6 +269,18 @@ driver_sources = [
'libvirt-stream.c',
]
+driver_headers = [
+ 'driver-hypervisor.h',
+ 'driver-interface.h',
+ 'driver-network.h',
+ 'driver-nodedev.h',
+ 'driver-nwfilter.h',
+ 'driver-secret.h',
+ 'driver-state.h',
+ 'driver-storage.h',
+ 'driver-stream.h',
+]
+
driver_lib = static_library(
'virt_driver',
[
@@ -813,3 +825,13 @@ test(
],
env: runutf8,
)
+
+test(
+ 'check-drivername',
+ python3_prog,
+ args: [
+ check_drivername_prog.path(), files(driver_headers),
+ files('libvirt_public.syms'), libvirt_qemu_syms, libvirt_lxc_syms,
+ ],
+ env: runutf8,
+)
--
2.26.2
