meson: src: add check-aclrules test

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-07-28 13:46:34 +02:00
parent adf59b27a2
commit dc6a76f32e
24 changed files with 28 additions and 59 deletions

View File

@ -21,7 +21,6 @@
# that actually use them. # that actually use them.
BUILT_SOURCES = BUILT_SOURCES =
STATEFUL_DRIVER_SOURCE_FILES =
augeas_DATA = augeas_DATA =
augeastest_DATA = augeastest_DATA =
if WITH_DTRACE_PROBES if WITH_DTRACE_PROBES
@ -31,17 +30,7 @@ RPC_PROBE_FILES =
include locking/Makefile.inc.am include locking/Makefile.inc.am
include admin/Makefile.inc.am include admin/Makefile.inc.am
include qemu/Makefile.inc.am
include bhyve/Makefile.inc.am
include libxl/Makefile.inc.am
include vz/Makefile.inc.am
include lxc/Makefile.inc.am include lxc/Makefile.inc.am
include interface/Makefile.inc.am
include network/Makefile.inc.am
include nwfilter/Makefile.inc.am
include node_device/Makefile.inc.am
include secret/Makefile.inc.am
include storage/Makefile.inc.am
# Keep this list synced with RPC_PROBE_FILES # Keep this list synced with RPC_PROBE_FILES
@ -98,18 +87,12 @@ else !WITH_REMOTE
check-protocol: check-protocol:
endif !WITH_REMOTE endif !WITH_REMOTE
check-aclrules:
$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-aclrules.py \
$(REMOTE_PROTOCOL) \
$(STATEFUL_DRIVER_SOURCE_FILES)
check-aclperms: check-aclperms:
$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-aclperms.py \ $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-aclperms.py \
$(srcdir)/access/viraccessperm.h \ $(srcdir)/access/viraccessperm.h \
$(srcdir)/access/viraccessperm.c $(srcdir)/access/viraccessperm.c
check-local: check-protocol \ check-local: check-protocol \
check-aclrules \
check-aclperms check-admin check-aclperms check-admin
.PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)

View File

@ -1,3 +0,0 @@
# vim: filetype=automake
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))

View File

@ -11,6 +11,7 @@ bhyve_sources = files(
) )
driver_source_files += bhyve_sources driver_source_files += bhyve_sources
stateful_driver_source_files += bhyve_sources
if conf.has('WITH_BHYVE') if conf.has('WITH_BHYVE')
bhyve_driver_impl = static_library( bhyve_driver_impl = static_library(

View File

@ -1,4 +0,0 @@
# vim: filetype=automake
STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES))

View File

@ -11,6 +11,7 @@ if conf.has('WITH_UDEV')
endif endif
driver_source_files += files(interface_driver_sources) driver_source_files += files(interface_driver_sources)
stateful_driver_source_files += files(interface_driver_sources)
if conf.has('WITH_INTERFACE') if conf.has('WITH_INTERFACE')
virt_modules += { virt_modules += {

View File

@ -1,3 +0,0 @@
# vim: filetype=automake
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES))

View File

@ -11,6 +11,7 @@ libxl_driver_sources = [
] ]
driver_source_files += files(libxl_driver_sources) driver_source_files += files(libxl_driver_sources)
stateful_driver_source_files += files(libxl_driver_sources)
if conf.has('WITH_LIBXL') if conf.has('WITH_LIBXL')
libxl_driver_imp = static_library( libxl_driver_imp = static_library(

View File

@ -1,10 +1,5 @@
# vim: filetype=automake # vim: filetype=automake
STATEFUL_DRIVER_SOURCE_FILES += \
$(LXC_MONITOR_PROTOCOL_GENERATED) \
$(LXC_MONITOR_GENERATED) \
$(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES))
if WITH_LXC if WITH_LXC
if WITH_DTRACE_PROBES if WITH_DTRACE_PROBES

View File

@ -46,6 +46,12 @@ driver_source_files += [
lxc_monitor_generated, lxc_monitor_generated,
] ]
stateful_driver_source_files += [
files(lxc_driver_sources),
lxc_monitor_protocol_generated,
lxc_monitor_generated,
]
lxc_controller_sources = files( lxc_controller_sources = files(
'lxc_conf.c', 'lxc_conf.c',
'lxc_container.c', 'lxc_container.c',

View File

@ -219,6 +219,10 @@ virt_install_dirs = []
# driver source files to check # driver source files to check
driver_source_files = [] driver_source_files = []
# stateful_driver_source_files:
# stateful driver source files to check
stateful_driver_source_files = []
# list subdirectories # list subdirectories
@ -875,3 +879,10 @@ test(
args: [ check_driverimpls_prog.path(), driver_source_files ], args: [ check_driverimpls_prog.path(), driver_source_files ],
env: runutf8, env: runutf8,
) )
test(
'check-aclrules',
python3_prog,
args: [ check_aclrules_prog.path(), files('remote/remote_protocol.x'), stateful_driver_source_files ],
env: runutf8,
)

View File

@ -1,4 +0,0 @@
# vim: filetype=automake
STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES))

View File

@ -4,6 +4,7 @@ network_driver_sources = [
] ]
driver_source_files += files(network_driver_sources) driver_source_files += files(network_driver_sources)
stateful_driver_source_files += files(network_driver_sources)
network_leases_helper_sources = files( network_leases_helper_sources = files(
'leaseshelper.c', 'leaseshelper.c',

View File

@ -1,5 +0,0 @@
# vim: filetype=automake
STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \
$(NULL)

View File

@ -2,6 +2,8 @@ node_device_driver_sources = [
'node_device_driver.c', 'node_device_driver.c',
] ]
stateful_driver_source_files += files(node_device_driver_sources)
if conf.has('WITH_HAL') if conf.has('WITH_HAL')
node_device_driver_sources += 'node_device_hal.c' node_device_driver_sources += 'node_device_hal.c'
endif endif

View File

@ -1,4 +0,0 @@
# vim: filetype=automake
STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES))

View File

@ -7,6 +7,7 @@ nwfilter_driver_sources = [
] ]
driver_source_files += files(nwfilter_driver_sources) driver_source_files += files(nwfilter_driver_sources)
stateful_driver_source_files += files(nwfilter_driver_sources)
if conf.has('WITH_NWFILTER') if conf.has('WITH_NWFILTER')
nwfilter_driver_impl = static_library( nwfilter_driver_impl = static_library(

View File

@ -1,3 +0,0 @@
# vim: filetype=automake
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))

View File

@ -38,6 +38,7 @@ qemu_driver_sources = [
] ]
driver_source_files += files(qemu_driver_sources) driver_source_files += files(qemu_driver_sources)
stateful_driver_source_files += files(qemu_driver_sources)
qemu_dtrace_gen_headers = [] qemu_dtrace_gen_headers = []
qemu_dtrace_gen_objects = [] qemu_dtrace_gen_objects = []

View File

@ -1,4 +0,0 @@
# vim: filetype=automake
STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES))

View File

@ -3,6 +3,7 @@ secret_driver_sources = [
] ]
driver_source_files += files(secret_driver_sources) driver_source_files += files(secret_driver_sources)
stateful_driver_source_files += files(secret_driver_sources)
if conf.has('WITH_SECRETS') if conf.has('WITH_SECRETS')
virt_modules += { virt_modules += {

View File

@ -1,4 +0,0 @@
# vim: filetype=automake
STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES))

View File

@ -9,6 +9,7 @@ storage_driver_sources = [
] ]
driver_source_files += files(storage_driver_sources) driver_source_files += files(storage_driver_sources)
stateful_driver_source_files += files(storage_driver_sources)
storage_backend_fs_sources = [ storage_backend_fs_sources = [
'storage_backend_fs.c', 'storage_backend_fs.c',

View File

@ -1,3 +0,0 @@
# vim: filetype=automake
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES))

View File

@ -5,6 +5,7 @@ vz_driver_sources = [
] ]
driver_source_files += files(vz_driver_sources) driver_source_files += files(vz_driver_sources)
stateful_driver_source_files += files(vz_driver_sources)
if conf.has('WITH_VZ') if conf.has('WITH_VZ')
vz_driver_impl = static_library( vz_driver_impl = static_library(