From 3c581b0e2bc45de3dab397d7759f155e9985a07e Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 18 May 2020 11:35:45 +0200 Subject: [PATCH] meson: src: add check-drivername test Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- 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 74df68a26b..1f05715e28 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -100,25 +100,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) @@ -134,7 +115,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 35a7b0c4ef..b27368938e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -277,6 +277,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', [ @@ -842,3 +854,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, +)