On 04/21/2016 01:50 PM, Cole Robinson wrote:
Store the test list in libvirtd_test_scripts, and use it where
appropriate. This also fixes the fact that we didn't ship
virsh-uriprecedence when libvirtd build is disabled.
---
tests/Makefile.am | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index db4f88b..b32435d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -367,8 +367,7 @@ test_scripts = \
domainsnapshotschematest \
secretschematest
-if WITH_LIBVIRTD
-test_scripts += \
+libvirtd_test_scripts = \
test_conf.sh \
cpuset \
define-dev-segfault \
@@ -387,27 +386,14 @@ test_scripts += \
virsh-undefine \
$(NULL)
+if WITH_LIBVIRTD
+test_scripts += $(libvirtd_test_scripts)
+
test_programs += \
eventtest \
libvirtdconftest
else ! WITH_LIBVIRTD
-EXTRA_DIST += \
- test_conf.sh \
- cpuset \
- define-dev-segfault \
- int-overflow \
- libvirtd-fail \
- libvirtd-pool \
- read-bufsiz \
- read-non-seekable \
- start \
- vcpupin \
- virsh-all \
- virsh-optparse \
- virsh-schedinfo \
- virsh-synopsis \
- virsh-undefine \
- $(NULL)
+EXTRA_DIST += $(libvirtd_test_scripts)
endif ! WITH_LIBVIRTD
test_programs += objecteventtest
ACK
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list