[Libguestfs] [PATCH nbdkit 3/3] tests: fix generation of PKI test data

[Richard W.M. Jones]

On Fri, Oct 06, 2017 at 10:52:24AM +0200, Pino Toscano wrote:
> Move the generation of PKI test data outside of the HAVE_LIBGUESTFS,
> otherwise they will not be generated when the tests using libguestfs
> are not enabled.
> 
> Also, use $(srcdir) to properly refr to make-pki.sh in the source
> directory, fixing the build with builddir!=srcdir.
> ---
>  tests/Makefile.am | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 9a42964..f2775bd 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -133,6 +133,11 @@ TESTS += test-exit-with-parent
>  test_exit_with_parent_SOURCES = test-exit-with-parent.c test.h
>  test_exit_with_parent_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
>  
> +# PKI files for the TLS tests.
> +check_DATA += pki/.stamp
> +pki/.stamp: $(srcdir)/make-pki.sh
> +	$(srcdir)/make-pki.sh
> +
>  # In-depth tests need libguestfs, since that is a convenient way to
>  # drive qemu.
>  
> @@ -177,11 +182,6 @@ test_oldstyle_SOURCES = test-oldstyle.c test.h
>  test_oldstyle_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
>  test_oldstyle_LDADD = libtest.la $(LIBGUESTFS_LIBS)
>  
> -# PKI files for the TLS tests.
> -check_DATA += pki/.stamp
> -pki/.stamp: make-pki.sh
> -	./make-pki.sh
> -
>  # file plugin test.
>  check_PROGRAMS += test-file
>  TESTS += test-file
> -- 
> 2.13.6

ACK series.

Thanks,

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top