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

Re: [libvirt] [PATCH 2/n] build: only run fdstreamtest when libvirtd is built



On 04.09.2013 00:48, Eric Blake wrote:
> 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 | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index c800179..f46ff56 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -128,10 +128,13 @@ test_programs = virshtest sockettest \
>          virportallocatortest \
>  	sysinfotest \
>  	virstoragetest \
> -        fdstreamtest \
>          fchosttest \
>  	$(NULL)
> 
> +if WITH_LIBVIRTD
> +test_programs += fdstreamtest
> +endif
> +
>  if WITH_DBUS
>  test_programs += virdbustest \
>                   virsystemdtest
> 

ACK

Michal


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