[libvirt PATCH 250/351] meson: src: add check-admin-symsorting test

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


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/admin/Makefile.inc.am |  8 +-------
 src/admin/meson.build     |  6 +++++-
 src/meson.build           | 11 +++++++++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am
index a2af10a158d..9d6f3c4cca4 100644
--- a/src/admin/Makefile.inc.am
+++ b/src/admin/Makefile.inc.am
@@ -1,13 +1,7 @@
 # vim: filetype=automake
 
-ADMIN_SYM_FILES = $(srcdir)/admin/libvirt_admin_private.syms
-
-check-admin-symsorting:
-	$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symsorting.py \
-		$(srcdir) $(ADMIN_SYM_FILES)
-
 check-admin-drivername:
 	$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-drivername.py \
 		$(srcdir)/admin/libvirt_admin_public.syms
 
-check-admin: check-admin-symsorting check-admin-drivername
+check-admin: check-admin-drivername
diff --git a/src/admin/meson.build b/src/admin/meson.build
index 5652a58e0fb..ed675270845 100644
--- a/src/admin/meson.build
+++ b/src/admin/meson.build
@@ -51,11 +51,15 @@ admin_client_generated = custom_target(
   capture: true,
 )
 
+libvirt_admin_private_syms = files(
+  'libvirt_admin_private.syms',
+)
+
 libvirt_admin_syms = custom_target(
   'libvirt_admin.syms',
   input: [
     'libvirt_admin_public.syms',
-    'libvirt_admin_private.syms',
+    libvirt_admin_private_syms,
   ],
   output: 'libvirt_admin.syms',
   command: [ gen_sym_files_prog, 'LIBVIRT_ADMIN_PRIVATE_' + meson.project_version(), '@INPUT@' ],
diff --git a/src/meson.build b/src/meson.build
index 9a2a152f316..24c54241a68 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -866,6 +866,17 @@ test(
   env: runutf8,
 )
 
+test(
+  'check-admin-symsorting',
+  python3_prog,
+  args: [
+    check_symsorting_prog.path(),
+    meson.current_source_dir(),
+    libvirt_admin_private_syms,
+  ],
+  env: runutf8,
+)
+
 test(
   'check-drivername',
   python3_prog,
-- 
2.26.2




More information about the libvir-list mailing list