]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
build: only run fdstreamtest when libvirtd is built
authorEric Blake <eblake@redhat.com>
Tue, 3 Sep 2013 21:55:21 +0000 (15:55 -0600)
committerEric Blake <eblake@redhat.com>
Wed, 4 Sep 2013 18:44:41 +0000 (12:44 -0600)
An rpm build with client_only set to 1 (for example, RHEL 5 on
s390, or by modifying libvirt.spec.in) failed with

TEST: fdstreamtest
 1) Stream read blocking                                              ... OK
 2) Stream read non-blocking                                          ... Unexpected EOF block 0 want 128
FAILED
 3) Stream write blocking                                             ... OK
 4) Stream write non-blocking                                         ... Failed to finish stream: internal error: libvirt:  error : cannot execute binary /home/eblake/rpmbuild/BUILD/libvirt-1.1.1/tests/../src/libvirt_iohelper: No such file or directory

Since the test depends on something that was only built for
WITH_LIBVIRTD (see src/Makefile.am), we must do the same for
the test.

* tests/Makefile.am (test_programs): Make fdstreamtest conditional.

Signed-off-by: Eric Blake <eblake@redhat.com>
tests/Makefile.am

index 1d38f76fa7fb7c607ff07dfb161eae8d0856052b..1a2436793f719676f4c153ca06908ca90a07215f 100644 (file)
@@ -128,10 +128,13 @@ test_programs = virshtest sockettest \
         virportallocatortest \
        sysinfotest \
        virstoragetest \
-        fdstreamtest \
         fchosttest \
        $(NULL)
 
+if WITH_LIBVIRTD
+test_programs += fdstreamtest
+endif WITH_LIBVIRTD
+
 if WITH_DBUS
 test_programs += virdbustest \
                  virsystemdtest