[libvirt PATCH 224/351] meson: src: generate libvirt daemon augeas test files

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 

Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
 src/bhyve/Makefile.inc.am   |  6 ------
 src/bhyve/meson.build       |  5 +++++
 src/libxl/Makefile.inc.am   |  6 ------
 src/libxl/meson.build       |  5 +++++
 src/locking/Makefile.inc.am | 32 --------------------------------
 src/locking/meson.build     | 15 +++++++++++++++
 src/logging/Makefile.inc.am |  9 ---------
 src/logging/meson.build     |  5 +++++
 src/lxc/Makefile.inc.am     |  6 ------
 src/lxc/meson.build         |  5 +++++
 src/qemu/Makefile.inc.am    |  6 ------
 src/qemu/meson.build        |  5 +++++
 12 files changed, 40 insertions(+), 65 deletions(-)

diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index 9583580ab02..e09c503c384 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -31,10 +31,4 @@ bhyve/test_virtbhyved.aug: remote/test_libvirtd.aug.in \
 		-e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \
 		> $@ || rm -f $@
 
-augeastest_DATA += bhyve/test_libvirtd_bhyve.aug
-
-bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \
-		$(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST_SCRIPT)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< > $@
-
 endif WITH_BHYVE
diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build
index 9380ec3313f..74caddf030e 100644
--- a/src/bhyve/meson.build
+++ b/src/bhyve/meson.build
@@ -46,4 +46,9 @@ if conf.has('WITH_BHYVE')
 
   virt_conf_files += files('bhyve.conf')
   virt_aug_files += files('libvirtd_bhyve.aug')
+  virt_test_aug_files += {
+    'name': 'test_libvirtd_bhyve.aug',
+    'aug': files('test_libvirtd_bhyve.aug.in'),
+    'conf': files('bhyve.conf'),
+  }
 endif
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 021bf4b8d51..9af04c4914a 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -71,12 +71,6 @@ libxl/test_virtxend.aug: remote/test_libvirtd.aug.in \
 		-e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \
 		> $@ || rm -f $@
 
-augeastest_DATA += libxl/test_libvirtd_libxl.aug
-
-libxl/test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \
-		$(srcdir)/libxl/libxl.conf $(AUG_GENTEST_SCRIPT)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< > $@
-
 INSTALL_DATA_DIRS += libxl
 
 install-data-libxl:
diff --git a/src/libxl/meson.build b/src/libxl/meson.build
index 0415a0c4a71..92916831120 100644
--- a/src/libxl/meson.build
+++ b/src/libxl/meson.build
@@ -47,4 +47,9 @@ if conf.has('WITH_LIBXL')
 
   virt_conf_files += files('libxl.conf')
   virt_aug_files += files('libvirtd_libxl.aug')
+  virt_test_aug_files += {
+    'name': 'test_libvirtd_libxl.aug',
+    'aug': files('test_libvirtd_libxl.aug.in'),
+    'conf': files('libxl.conf'),
+  }
 endif
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 0826472cfca..a2a0a4c6250 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -19,18 +19,6 @@ OPENRC_INIT_FILES_IN += \
 	locking/virtlockd.init.in \
 	$(NULL)
 
-if WITH_LIBVIRTD
-if WITH_QEMU
-augeastest_DATA += locking/test_libvirt_lockd.aug
-endif WITH_QEMU
-if WITH_SANLOCK
-if WITH_QEMU
-augeastest_DATA += locking/test_libvirt_sanlock.aug
-endif WITH_QEMU
-endif WITH_SANLOCK
-
-augeastest_DATA += locking/test_virtlockd.aug
-
 INSTALL_DATA_DIRS += locking
 
 install-data-locking:
@@ -48,26 +36,6 @@ uninstall-data-locking:
 if WITH_SANLOCK
 	rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||:
 endif WITH_SANLOCK
-
-if WITH_SANLOCK
-if WITH_QEMU
-locking/test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
-		locking/qemu-sanlock.conf $(AUG_GENTEST_SCRIPT)
-	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< > $@
-
-endif WITH_QEMU
-endif WITH_SANLOCK
-
-if WITH_QEMU
-locking/test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
-		locking/qemu-lockd.conf $(AUG_GENTEST_SCRIPT)
-	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< > $@
-endif WITH_QEMU
-
-locking/test_virtlockd.aug: locking/test_virtlockd.aug.in \
-		locking/virtlockd.conf $(AUG_GENTEST_SCRIPT)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< > $@
-
 endif WITH_LIBVIRTD
 
 .PHONY: \
diff --git a/src/locking/meson.build b/src/locking/meson.build
index 9e09c96f67b..0681e4fbc4d 100644
--- a/src/locking/meson.build
+++ b/src/locking/meson.build
@@ -155,6 +155,11 @@ if conf.has('WITH_LIBVIRTD')
       copy: true,
     )
     virt_conf_files += qemu_lockd_conf
+    virt_test_aug_files += {
+      'name': 'test_libvirt_lockd.aug',
+      'aug' : files('test_libvirt_lockd.aug.in'),
+      'conf': qemu_lockd_conf,
+    }
   endif
 
   if conf.has('WITH_LIBXL')
@@ -176,6 +181,11 @@ if conf.has('WITH_LIBVIRTD')
         copy: true,
       )
       virt_conf_files += qemu_sanlock_conf
+      virt_test_aug_files += {
+        'name': 'test_libvirt_sanlock.aug',
+        'aug' : files('test_libvirt_sanlock.aug.in'),
+        'conf': qemu_sanlock_conf,
+      }
     endif
 
     if conf.has('WITH_LIBXL')
@@ -190,4 +200,9 @@ if conf.has('WITH_LIBVIRTD')
 
   virt_conf_files += files('virtlockd.conf')
   virt_aug_files += files('virtlockd.aug')
+  virt_test_aug_files += {
+    'name': 'test_virtlockd.aug',
+    'aug': files('test_virtlockd.aug.in'),
+    'conf': files('virtlockd.conf'),
+  }
 endif
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index 1ae0078e434..b13f53ffe41 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -18,15 +18,6 @@ OPENRC_INIT_FILES_IN += \
 	logging/virtlogd.init.in \
 	$(NULL)
 
-if WITH_LIBVIRTD
-augeastest_DATA += logging/test_virtlogd.aug
-
-logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \
-		logging/virtlogd.conf $(AUG_GENTEST_SCRIPT)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< > $@
-
-endif WITH_LIBVIRTD
-
 virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@
 
diff --git a/src/logging/meson.build b/src/logging/meson.build
index 9594646c81f..4897cbf1f32 100644
--- a/src/logging/meson.build
+++ b/src/logging/meson.build
@@ -72,4 +72,9 @@ if conf.has('WITH_LIBVIRTD')
 
   virt_conf_files += files('virtlogd.conf')
   virt_aug_files += files('virtlogd.aug')
+  virt_test_aug_files += {
+    'name': 'test_virtlogd.aug',
+    'aug': files('test_virtlogd.aug.in'),
+    'conf': files('virtlogd.conf'),
+  }
 endif
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index aea70f37a87..bee6c99b025 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -77,12 +77,6 @@ if WITH_DTRACE_PROBES
 RPC_PROBE_FILES += $(srcdir)/lxc/lxc_monitor_protocol.x
 endif
 
-augeastest_DATA += lxc/test_libvirtd_lxc.aug
-
-lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
-		$(srcdir)/lxc/lxc.conf $(AUG_GENTEST_SCRIPT)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< > $@
-
 INSTALL_DATA_DIRS += lxc
 
 install-data-lxc:
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 7295510c62b..825c280bd10 100644
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -131,4 +131,9 @@ if conf.has('WITH_LXC')
 
   virt_conf_files += files('lxc.conf')
   virt_aug_files += files('libvirtd_lxc.aug')
+  virt_test_aug_files += {
+    'name': 'test_libvirtd_lxc.aug',
+    'aug': files('test_libvirtd_lxc.aug.in'),
+    'conf': files('lxc.conf'),
+  }
 endif
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 5817e1266f3..ff8a3dcbdc6 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -66,12 +66,6 @@ qemu/test_virtqemud.aug: remote/test_libvirtd.aug.in \
 		-e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \
 		> $@ || rm -f $@
 
-augeastest_DATA += qemu/test_libvirtd_qemu.aug
-
-qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \
-		$(srcdir)/qemu/qemu.conf $(AUG_GENTEST_SCRIPT)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< > $@
-
 INSTALL_DATA_DIRS += qemu
 
 install-data-qemu:
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 680ca2189a6..4d5cfec7eaa 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -120,6 +120,11 @@ if conf.has('WITH_QEMU')
 
   virt_conf_files += files('qemu.conf')
   virt_aug_files += files('libvirtd_qemu.aug')
+  virt_test_aug_files += {
+    'name': 'test_libvirtd_qemu.aug',
+    'aug': files('test_libvirtd_qemu.aug.in'),
+    'conf': files('qemu.conf'),
+  }
 
   virt_helpers += {
     'name': 'virt-qemu-run',
-- 
2.26.2
[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux