tests: build: Remove duplicate libvirtd test list

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.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index db4f88b883cf3f8d618d4b273321a05aa34fe2a6..b32435d2f344e3811cea0a67c6e17db9aee174bc 100644 (file)
--- 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