meson: src: add check-driverimpls test

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 1f05715e28fa4e5801958cb447d209802da1a44e..fb3c4a837840663e52c5228dcddd8f5a7ca44846 100644 (file)
--- 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 65021d785a29eb973050f72a7d4f9c6ab323be4c..7a9c6a87242eadbaaec68d3df143aeb4030f5051 100644 (file)
--- 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 419b419f9508388b94f3c245a11e92b67f547318..dbd4c64cea675c02516886f73a12197f6fef2ef1 100644 (file)
--- 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 06bd8f820b13462a8acb5386168a6a6a3e2da279..6cd6dff3b909dd5dae9da560ea9604f107116bf4 100644 (file)
--- 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 89e3ebdead2a874f43d81c04c3bb35952bb13532..f2dd92cf1a185ac2fc4d3e100fb5bcd47882069f 100644 (file)
--- 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 5af19c835124b9faa3e8f523ade614b5cb207dec..d713f4e75aab8939839b3e0540cbf3ad93e83ea9 100644 (file)
--- 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 da4f29f90608560423e59ec5ac7bc9dea44a98d5..44b2591ec857d14c5933d148b99613f8ad51ce0d 100644 (file)
--- 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 7f312975d6c2e6bb1ad0b3acc91998fd653d921f..6abd08e333e47a17cf08096f2326aa414435cc1f 100644 (file)
--- 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 1684cbec8a2d714081b4c863e7576c5e2ae1b7cb..b2954f40a7ecb1bf4bac96032578a251b71d9bef 100644 (file)
--- 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 b27368938ede752df155ccd1129cd7a88a795e4b..0a366a8256ac1906459c9c2ef9f404c80c30f188 100644 (file)
--- 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 c13a6831cc063490f8f65c8ee6baf8fb4317ca38..cf5cff4ea8852d3dc294f909fa638b550bfe8df2 100644 (file)
--- 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 0481440d3a75d746f6bc3374ad77566227f756ac..7e316c968ef95aa257311dbdfca033e5dacd70d4 100644 (file)
--- 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 63d2548e11f133a674a959b4fbca0c4e93bc2f2a..ddd906fa78227715f1a368e3c1326a9a61da07de 100644 (file)
--- 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 31e968a6d64d31e804226b5351a3fb5c2ff3c2d0..c14f09a793b30bb57f5a56f60ff609343dd9e464 100644 (file)
--- 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 4d34d7f3ad160c36ccb3d57fc88d8f7b6b732244..68bc42c2edf14eff93727b274f16ff69b3d094aa 100644 (file)
--- 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 2459e29485e88237707f6ae514f2ff192eda3870..d4b9cc890b9049a599576bfff1460d664d5bd859 100644 (file)
--- 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 f665cb1f1306c33634806390ac81f3c0a2155a7f..96265d2893b597482ab7a6cf2a1df0107c4cf9fd 100644 (file)
--- 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 fd0f25c84da452359317f3bf133ffa44e09fd04a..25cf66b97280bae87529d695119f6a0f98128367 100644 (file)
--- 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 a60a6b507f4137db726ccd9e6540042fb1c9b8e5..361305283a5dbdaaa0b5ae18856421f2b8220d30 100644 (file)
--- 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 0c7949aa41284e9b6f8fe63ea20dec016968bf3c..4410b781bd401cc7f8c34ddaa7101ca9c84dade0 100644 (file)
--- 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 d5438e8a71c275e9707f662efdfe18d9ac1765aa..0834ac43a64919e433aadc190b9d496ea36da324 100644 (file)
--- 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 52b7b3b2766c2bbe2eca52fcf09d766ddbc37780..9cb13f2996d04ba3a6cf59ba81aee300a6d5138a 100644 (file)
--- 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 (file)
index 6197c31..0000000
--- 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 ddd53f99915788ace311b70ad9b081aade9c2ae4..3e608fa1018321300ba6192943a582e21a778d80 100644 (file)
--- 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 380d1ffb83969119f8c8b5b813b1f9a95b20931e..eb6721fb1351d93d2ea309f90b74286935e6c48d 100644 (file)
--- 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 1f54c1f4d92a39168298ab59c4b52b92f415559a..7101f092c8cd83913805d8954cfe4a28754cb250 100644 (file)
--- 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',