meson: src: generate libvirt daemon augeas test files

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index 9583580ab0290a47f0154c5d9796e8131e410da9..e09c503c384bdd2e016a5c5824fbffba53cff722 100644 (file)
--- 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 9380ec3313f280d9c30dc64a41896b78d0d7e329..74caddf030e9bd1b92d717dcd4841c4b65bbadf8 100644 (file)
--- 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 021bf4b8d5196721466bb083dd5354acca8ed8d9..9af04c4914a7da58c9150dcc0869bca2c123272d 100644 (file)
--- 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 0415a0c4a71b91630c7042c7b0e7ce209a3919be..929168311207b7d27958cdce34d621c7fd02c06a 100644 (file)
--- 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 0826472cfcac6c29046dab0d42cfa218e98d3501..a2a0a4c6250b9707a84c0f0960adb729c3607a26 100644 (file)
--- 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 9e09c96f67b8a40b6a04f6bf29bbad165c76d06a..0681e4fbc4dc814083b50958fb5b4b90c86a0f18 100644 (file)
--- 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 1ae0078e43499bf892307f26f8b3bf5bf13aa2e7..b13f53ffe41c5abb0dcf2cc090d2c2265b3195d3 100644 (file)
--- 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 7560488ae0fc919152299f22c184e6782aa69a49..dfbef3c12f46306bbcf37b4156b33967507e4516 100644 (file)
--- a/src/logging/meson.build
+++ b/src/logging/meson.build
@@ -73,6 +73,11 @@ 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
 
 log_inc_dir = include_directories('.')

diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index aea70f37a87910b076f74cd7ee7f21b74c3618a2..bee6c99b0252a1f2f1cc5ebd79167be4257d90c0 100644 (file)
--- 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 7295510c62b35b5fd2fe89e33586a600fae42c81..825c280bd108ed64976ed99a04cc6523a40acb8e 100644 (file)
--- 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 5817e1266f3cc603f2384f61d4dd43980143885e..ff8a3dcbdc6f45b16a4c1f40d6b527417b3f74af 100644 (file)
--- 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 cbaa5f7a72b00834b0405743df6d27e353aaaf28..6bd7fb0b91b5b1819f5a391b7576275259484019 100644 (file)
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -124,6 +124,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',