From nobody Sun Feb 8 06:21:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594894401; cv=none; d=zohomail.com; s=zohoarc; b=Rq1nMANFHuqmLFvNByMSfUeeRKpj1+9mQZdJDZAjujaxtwir7ZyHuuULwaA4DaU2ajOUJdwG2GJ2t2zvFcglApy3rk6ZtqQkW7CrkBgjzqEb80g6vt1nXfoow5ryRqJ90WYetSYrq4OhUMHZsHX1KtpADWi9tetxoyi7v5JYi9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894401; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=O3giV5AaWYFtu5Ao4vC+i+fDyPQXXa0GyaCoJKAsiA8=; b=lnygT2MrrHHFDSEODq4CRbPGcgdoLNdleq26VZ6+Vu27AxQs4hggfuVfhzbBcdMfXvhp26iC674F6ccpJsEV/CewwMrvTQn2CTZc1iUvOqBnFuH5C/kcDTCweXldcdRcGVwgWh82i5srZRDmwYCsopICjjTWRQPel78irAwi0f4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894401675840.4507990608955; Thu, 16 Jul 2020 03:13:21 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-329-SFpYauZFNKuLiKsVM3PNdw-1; Thu, 16 Jul 2020 06:10:10 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 861CC10059C4; Thu, 16 Jul 2020 10:10:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 63CE679505; Thu, 16 Jul 2020 10:10:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2C54D1805318; Thu, 16 Jul 2020 10:10:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA63hw019121 for ; Thu, 16 Jul 2020 06:06:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 84CCA2B6DC; Thu, 16 Jul 2020 10:06:03 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1D332B6DB for ; Thu, 16 Jul 2020 10:06:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894400; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=O3giV5AaWYFtu5Ao4vC+i+fDyPQXXa0GyaCoJKAsiA8=; b=Yio0tNK5d0Voj1TLt4/p80HeryrwkGlR730589En8h/uSR3SphPYXVxf2ZAQ5Asjagl6vU MHyTL04jGyg/p4pvwOPZWA3VWz5rTkqWSwuRxk3nFLX1reUefF+bpkUFIuTj//lN5QDB+q sq5XMEhaO4S2MQoCtGhoIzPcBPMCCkk= X-MC-Unique: SFpYauZFNKuLiKsVM3PNdw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 244/351] meson: src: add check-aclrules test Date: Thu, 16 Jul 2020 11:58:00 +0200 Message-Id: <055e2ecbb83bb71b9b6cd412e2b5a9b2f75da65c.1594891445.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/Makefile.am | 17 ----------------- src/bhyve/Makefile.inc.am | 3 --- src/bhyve/meson.build | 1 + src/interface/Makefile.inc.am | 4 ---- src/interface/meson.build | 1 + src/libxl/Makefile.inc.am | 3 --- src/libxl/meson.build | 1 + src/lxc/Makefile.inc.am | 5 ----- src/lxc/meson.build | 6 ++++++ src/meson.build | 11 +++++++++++ src/network/Makefile.inc.am | 4 ---- src/network/meson.build | 1 + src/node_device/Makefile.inc.am | 5 ----- src/node_device/meson.build | 2 ++ src/nwfilter/Makefile.inc.am | 4 ---- src/nwfilter/meson.build | 1 + src/qemu/Makefile.inc.am | 3 --- src/qemu/meson.build | 1 + src/secret/Makefile.inc.am | 4 ---- src/secret/meson.build | 1 + src/storage/Makefile.inc.am | 4 ---- src/storage/meson.build | 1 + src/vz/Makefile.inc.am | 3 --- src/vz/meson.build | 1 + 24 files changed, 28 insertions(+), 59 deletions(-) delete mode 100644 src/bhyve/Makefile.inc.am delete mode 100644 src/interface/Makefile.inc.am delete mode 100644 src/libxl/Makefile.inc.am delete mode 100644 src/network/Makefile.inc.am delete mode 100644 src/node_device/Makefile.inc.am delete mode 100644 src/nwfilter/Makefile.inc.am delete mode 100644 src/qemu/Makefile.inc.am delete mode 100644 src/secret/Makefile.inc.am delete mode 100644 src/storage/Makefile.inc.am delete mode 100644 src/vz/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 54e3ed42974..3b5195f2266 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,6 @@ # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. =20 -STATEFUL_DRIVER_SOURCE_FILES =3D augeas_DATA =3D augeastest_DATA =3D if WITH_DTRACE_PROBES @@ -30,17 +29,7 @@ RPC_PROBE_FILES =3D =20 include locking/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 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 =20 =20 # Keep this list synced with RPC_PROBE_FILES @@ -97,18 +86,12 @@ else !WITH_REMOTE check-protocol: endif !WITH_REMOTE =20 -check-aclrules: - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-aclrules.py \ - $(REMOTE_PROTOCOL) \ - $(STATEFUL_DRIVER_SOURCE_FILES) - check-aclperms: $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-aclperms.py \ $(srcdir)/access/viraccessperm.h \ $(srcdir)/access/viraccessperm.c =20 check-local: check-protocol \ - check-aclrules \ check-aclperms check-admin .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am deleted file mode 100644 index 7a9c6a87242..00000000000 --- a/src/bhyve/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SO= URCES)) diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 12b933b0b44..6dc8b7d29ff 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -11,6 +11,7 @@ bhyve_sources =3D files( ) =20 driver_source_files +=3D bhyve_sources +stateful_driver_source_files +=3D bhyve_sources =20 if conf.has('WITH_BHYVE') bhyve_driver_impl =3D static_library( diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am deleted file mode 100644 index 6cd6dff3b90..00000000000 --- a/src/interface/Makefile.inc.am +++ /dev/null @@ -1,4 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) diff --git a/src/interface/meson.build b/src/interface/meson.build index bd04a7f350f..bf9d649282e 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -11,6 +11,7 @@ if conf.has('WITH_UDEV') endif =20 driver_source_files +=3D files(interface_driver_sources) +stateful_driver_source_files +=3D files(interface_driver_sources) =20 if conf.has('WITH_INTERFACE') virt_modules +=3D { diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am deleted file mode 100644 index d713f4e75aa..00000000000 --- a/src/libxl/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SO= URCES)) diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 6720d826435..b2e9ca07d4a 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -11,6 +11,7 @@ libxl_driver_sources =3D [ ] =20 driver_source_files +=3D files(libxl_driver_sources) +stateful_driver_source_files +=3D files(libxl_driver_sources) =20 if conf.has('WITH_LIBXL') libxl_driver_imp =3D static_library( diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 6abd08e333e..564b3519bcb 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) \ - $(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES)) - if WITH_LXC =20 if WITH_DTRACE_PROBES diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 65dff6a7c4b..8b51093a387 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -46,6 +46,12 @@ driver_source_files +=3D [ lxc_monitor_generated, ] =20 +stateful_driver_source_files +=3D [ + files(lxc_driver_sources), + lxc_monitor_protocol_generated, + lxc_monitor_generated, +] + lxc_controller_sources =3D files( 'lxc_conf.c', 'lxc_container.c', diff --git a/src/meson.build b/src/meson.build index e30bf7e90b6..6747f11a3f3 100644 --- a/src/meson.build +++ b/src/meson.build @@ -211,6 +211,10 @@ virt_install_dirs =3D [] # driver source files to check driver_source_files =3D [] =20 +# stateful_driver_source_files: +# stateful driver source files to check +stateful_driver_source_files =3D [] + =20 # list subdirectories =20 @@ -846,3 +850,10 @@ test( args: [ check_driverimpls_prog.path(), driver_source_files ], env: runutf8, ) + +test( + 'check-aclrules', + python3_prog, + args: [ check_aclrules_prog.path(), files('remote/remote_protocol.x'), s= tateful_driver_source_files ], + env: runutf8, +) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am deleted file mode 100644 index cf5cff4ea88..00000000000 --- a/src/network/Makefile.inc.am +++ /dev/null @@ -1,4 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) diff --git a/src/network/meson.build b/src/network/meson.build index c33404dfd96..a3836bb12be 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -4,6 +4,7 @@ network_driver_sources =3D [ ] =20 driver_source_files +=3D files(network_driver_sources) +stateful_driver_source_files +=3D files(network_driver_sources) =20 network_leases_helper_sources =3D files( 'leaseshelper.c', diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am deleted file mode 100644 index ddd906fa782..00000000000 --- a/src/node_device/Makefile.inc.am +++ /dev/null @@ -1,5 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ - $(NULL) diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 0ac2aecf4f1..d833b329da4 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -2,6 +2,8 @@ node_device_driver_sources =3D [ 'node_device_driver.c', ] =20 +stateful_driver_source_files +=3D files(node_device_driver_sources) + if conf.has('WITH_HAL') node_device_driver_sources +=3D 'node_device_hal.c' endif diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am deleted file mode 100644 index 68bc42c2edf..00000000000 --- a/src/nwfilter/Makefile.inc.am +++ /dev/null @@ -1,4 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index c2c186903d8..6e9734e6a26 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -7,6 +7,7 @@ nwfilter_driver_sources =3D [ ] =20 driver_source_files +=3D files(nwfilter_driver_sources) +stateful_driver_source_files +=3D files(nwfilter_driver_sources) =20 if conf.has('WITH_NWFILTER') nwfilter_driver_impl =3D static_library( diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am deleted file mode 100644 index 96265d2893b..00000000000 --- a/src/qemu/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOU= RCES)) diff --git a/src/qemu/meson.build b/src/qemu/meson.build index c74acf9d14b..640ef273ca8 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -38,6 +38,7 @@ qemu_driver_sources =3D [ ] =20 driver_source_files +=3D files(qemu_driver_sources) +stateful_driver_source_files +=3D files(qemu_driver_sources) =20 qemu_dtrace_gen_headers =3D [] qemu_dtrace_gen_objects =3D [] diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am deleted file mode 100644 index 361305283a5..00000000000 --- a/src/secret/Makefile.inc.am +++ /dev/null @@ -1,4 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) diff --git a/src/secret/meson.build b/src/secret/meson.build index bbcd74ce309..1605729f49b 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -3,6 +3,7 @@ secret_driver_sources =3D [ ] =20 driver_source_files +=3D files(secret_driver_sources) +stateful_driver_source_files +=3D files(secret_driver_sources) =20 if conf.has('WITH_SECRETS') virt_modules +=3D { diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am deleted file mode 100644 index 0834ac43a64..00000000000 --- a/src/storage/Makefile.inc.am +++ /dev/null @@ -1,4 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) diff --git a/src/storage/meson.build b/src/storage/meson.build index b14dcf969d9..86abfedbdde 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -9,6 +9,7 @@ storage_driver_sources =3D [ ] =20 driver_source_files +=3D files(storage_driver_sources) +stateful_driver_source_files +=3D files(storage_driver_sources) =20 storage_backend_fs_sources =3D [ 'storage_backend_fs.c', diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am deleted file mode 100644 index eb6721fb135..00000000000 --- a/src/vz/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURC= ES)) diff --git a/src/vz/meson.build b/src/vz/meson.build index 903e1f1359f..0ab83731071 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -5,6 +5,7 @@ vz_driver_sources =3D [ ] =20 driver_source_files +=3D files(vz_driver_sources) +stateful_driver_source_files +=3D files(vz_driver_sources) =20 if conf.has('WITH_VZ') vz_driver_impl =3D static_library( --=20 2.26.2