[libvirt PATCH 241/351] meson: src: add check-symsorting

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:57:57 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/Makefile.am | 13 +------------
 src/meson.build | 11 +++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 0e0fc621e53..11fb9122631 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,8 +22,6 @@
 
 DRIVER_SOURCE_FILES =
 STATEFUL_DRIVER_SOURCE_FILES =
-SYM_FILES =
-USED_SYM_FILES =
 augeas_DATA =
 augeastest_DATA =
 if WITH_DTRACE_PROBES
@@ -47,10 +45,6 @@ include secret/Makefile.inc.am
 include storage/Makefile.inc.am
 
 
-check-symsorting:
-	$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symsorting.py \
-		$(srcdir) $(SYM_FILES)
-
 # Keep this list synced with RPC_PROBE_FILES
 PROTOCOL_STRUCTS = \
 	$(srcdir)/remote_protocol-structs \
@@ -138,17 +132,12 @@ check-aclperms:
 		$(srcdir)/access/viraccessperm.h \
 		$(srcdir)/access/viraccessperm.c
 
-check-local: check-protocol check-symsorting \
+check-local: check-protocol \
 	check-drivername check-driverimpls check-aclrules \
 	check-aclperms check-admin
 .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)
 
 
-# All .syms files should be placed in exactly one of these three lists,
-# depending on whether they are stored in git and/or used in the build.
-SYM_FILES += $(USED_SYM_FILES)
-
-
 check-local: check-augeas
 
 check-augeas: $(augeas_DATA) $(augeastest_DATA)
diff --git a/src/meson.build b/src/meson.build
index 0c94483965d..21d4b9aa412 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -802,3 +802,14 @@ if host_machine.system() == 'linux'
     env: runutf8,
   )
 endif
+
+test(
+  'check-symsorting',
+  python3_prog,
+  args: [
+    check_symsorting_prog.path(),
+    meson.current_source_dir(),
+    files(sym_files, used_sym_files),
+  ],
+  env: runutf8,
+)
-- 
2.26.2




More information about the libvir-list mailing list