From adf59b27a2ec0913c9f32100dee8615f9a52b2c9 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 27 Jul 2020 09:10:31 +0200 Subject: [PATCH] meson: src: add check-driverimpls test Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- src/Makefile.am | 8 +------- src/bhyve/Makefile.inc.am | 1 - src/bhyve/meson.build | 2 ++ src/interface/Makefile.inc.am | 1 - src/interface/meson.build | 2 ++ src/libxl/Makefile.inc.am | 1 - src/libxl/meson.build | 2 ++ src/lxc/Makefile.inc.am | 4 ---- src/lxc/meson.build | 6 ++++++ src/meson.build | 11 +++++++++++ src/network/Makefile.inc.am | 1 - src/network/meson.build | 2 ++ src/node_device/Makefile.inc.am | 6 ------ src/node_device/meson.build | 2 ++ src/nwfilter/Makefile.inc.am | 1 - src/nwfilter/meson.build | 2 ++ src/qemu/Makefile.inc.am | 1 - src/qemu/meson.build | 2 ++ src/secret/Makefile.inc.am | 1 - src/secret/meson.build | 2 ++ src/storage/Makefile.inc.am | 1 - src/storage/meson.build | 2 ++ src/vbox/Makefile.inc.am | 6 ------ src/vbox/meson.build | 5 +++++ src/vz/Makefile.inc.am | 1 - src/vz/meson.build | 2 ++ 26 files changed, 43 insertions(+), 32 deletions(-) delete mode 100644 src/vbox/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 1f05715e28..fb3c4a8378 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,6 @@ # that actually use them. BUILT_SOURCES = -DRIVER_SOURCE_FILES = STATEFUL_DRIVER_SOURCE_FILES = augeas_DATA = augeastest_DATA = @@ -32,7 +31,6 @@ RPC_PROBE_FILES = include locking/Makefile.inc.am include admin/Makefile.inc.am -include vbox/Makefile.inc.am include qemu/Makefile.inc.am include bhyve/Makefile.inc.am include libxl/Makefile.inc.am @@ -100,10 +98,6 @@ else !WITH_REMOTE check-protocol: endif !WITH_REMOTE -check-driverimpls: - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-driverimpls.py \ - $(DRIVER_SOURCE_FILES) - check-aclrules: $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-aclrules.py \ $(REMOTE_PROTOCOL) \ @@ -115,7 +109,7 @@ check-aclperms: $(srcdir)/access/viraccessperm.c check-local: check-protocol \ - check-driverimpls check-aclrules \ + check-aclrules \ check-aclperms check-admin .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 65021d785a..7a9c6a8724 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -1,4 +1,3 @@ # vim: filetype=automake -DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES)) diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 419b419f95..dbd4c64cea 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -10,6 +10,8 @@ bhyve_sources = files( 'bhyve_process.c', ) +driver_source_files += bhyve_sources + if conf.has('WITH_BHYVE') bhyve_driver_impl = static_library( 'virt_driver_bhyve_impl', diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 06bd8f820b..6cd6dff3b9 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=automake -DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) diff --git a/src/interface/meson.build b/src/interface/meson.build index 89e3ebdead..f2dd92cf1a 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -10,6 +10,8 @@ if conf.has('WITH_UDEV') interface_driver_sources += 'interface_backend_udev.c' endif +driver_source_files += files(interface_driver_sources) + if conf.has('WITH_INTERFACE') virt_modules += { 'name': 'virt_driver_interface', diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 5af19c8351..d713f4e75a 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -1,4 +1,3 @@ # vim: filetype=automake -DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) diff --git a/src/libxl/meson.build b/src/libxl/meson.build index da4f29f906..44b2591ec8 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -10,6 +10,8 @@ libxl_driver_sources = [ 'xen_xm.c', ] +driver_source_files += files(libxl_driver_sources) + if conf.has('WITH_LIBXL') libxl_driver_imp = static_library( 'virt_driver_libxl_impl', diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 7f312975d6..6abd08e333 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -1,9 +1,5 @@ # vim: filetype=automake -DRIVER_SOURCE_FILES += \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) \ - $(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(LXC_MONITOR_PROTOCOL_GENERATED) \ $(LXC_MONITOR_GENERATED) \ diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 1684cbec8a..b2954f40a7 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -40,6 +40,12 @@ lxc_monitor_generated = custom_target( capture: true, ) +driver_source_files += [ + files(lxc_driver_sources), + lxc_monitor_protocol_generated, + lxc_monitor_generated, +] + lxc_controller_sources = files( 'lxc_conf.c', 'lxc_container.c', diff --git a/src/meson.build b/src/meson.build index b27368938e..0a366a8256 100644 --- a/src/meson.build +++ b/src/meson.build @@ -215,6 +215,10 @@ sysconf_files = [] # list of directories to create during installation virt_install_dirs = [] +# driver_source_files: +# driver source files to check +driver_source_files = [] + # list subdirectories @@ -864,3 +868,10 @@ test( ], env: runutf8, ) + +test( + 'check-driverimpls', + python3_prog, + args: [ check_driverimpls_prog.path(), driver_source_files ], + env: runutf8, +) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index c13a6831cc..cf5cff4ea8 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=automake -DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) diff --git a/src/network/meson.build b/src/network/meson.build index 0481440d3a..7e316c968e 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -3,6 +3,8 @@ network_driver_sources = [ 'bridge_driver_platform.c', ] +driver_source_files += files(network_driver_sources) + network_leases_helper_sources = files( 'leaseshelper.c', ) diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am index 63d2548e11..ddd906fa78 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -1,11 +1,5 @@ # vim: filetype=automake -DRIVER_SOURCE_FILES += \ - $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ - $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_HAL_SOURCES)) \ - $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_UDEV_SOURCES)) \ - $(NULL) - STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ $(NULL) diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 31e968a6d6..c14f09a793 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -10,6 +10,8 @@ if conf.has('WITH_UDEV') node_device_driver_sources += 'node_device_udev.c' endif +driver_source_files += files(node_device_driver_sources) + if conf.has('WITH_NODE_DEVICES') node_device_driver_impl = static_library( 'virt_driver_nodedev_impl', diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 4d34d7f3ad..68bc42c2ed 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=automake -DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index 2459e29485..d4b9cc890b 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -6,6 +6,8 @@ nwfilter_driver_sources = [ 'nwfilter_learnipaddr.c', ] +driver_source_files += files(nwfilter_driver_sources) + if conf.has('WITH_NWFILTER') nwfilter_driver_impl = static_library( 'virt_driver_nwfilter_impl', diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index f665cb1f13..96265d2893 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -1,4 +1,3 @@ # vim: filetype=automake -DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) diff --git a/src/qemu/meson.build b/src/qemu/meson.build index fd0f25c84d..25cf66b972 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -37,6 +37,8 @@ qemu_driver_sources = [ 'qemu_virtiofs.c', ] +driver_source_files += files(qemu_driver_sources) + qemu_dtrace_gen_headers = [] qemu_dtrace_gen_objects = [] diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index a60a6b507f..361305283a 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=automake -DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) diff --git a/src/secret/meson.build b/src/secret/meson.build index 0c7949aa41..4410b781bd 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -2,6 +2,8 @@ secret_driver_sources = [ 'secret_driver.c', ] +driver_source_files += files(secret_driver_sources) + if conf.has('WITH_SECRETS') virt_modules += { 'name': 'virt_driver_secret', diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index d5438e8a71..0834ac43a6 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=automake -DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) diff --git a/src/storage/meson.build b/src/storage/meson.build index 52b7b3b276..9cb13f2996 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -8,6 +8,8 @@ storage_driver_sources = [ storage_driver_backend_sources, ] +driver_source_files += files(storage_driver_sources) + storage_backend_fs_sources = [ 'storage_backend_fs.c', ] diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am deleted file mode 100644 index 6197c3172b..0000000000 --- a/src/vbox/Makefile.inc.am +++ /dev/null @@ -1,6 +0,0 @@ -# vim: filetype=automake - -DRIVER_SOURCE_FILES += \ - $(addprefix $(srcdir)/,$(VBOX_DRIVER_SOURCES)) \ - $(srcdir)/vbox/vbox_tmpl.c \ - $(NULL) diff --git a/src/vbox/meson.build b/src/vbox/meson.build index ddd53f9991..3e608fa101 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -10,6 +10,11 @@ vbox_driver_sources = [ 'vbox_XPCOMCGlue.c', ] +driver_source_files += files( + vbox_driver_sources, + 'vbox_tmpl.c', +) + if conf.has('WITH_VBOX') vbox_driver_impl = static_library( 'virt_driver_vbox_impl', diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index 380d1ffb83..eb6721fb13 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -1,4 +1,3 @@ # vim: filetype=automake -DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) diff --git a/src/vz/meson.build b/src/vz/meson.build index 1f54c1f4d9..7101f092c8 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -4,6 +4,8 @@ vz_driver_sources = [ 'vz_sdk.c', ] +driver_source_files += files(vz_driver_sources) + if conf.has('WITH_VZ') vz_driver_impl = static_library( 'virt_driver_vz_impl',