Libguestfs - Sep 2019 - [p2v PATCH] tests: require virt-v2v for functional tests

virt-v2v is definitely used by the functional tests that run virt-p2v,
so check for it, and require it for running those tests.

Reported by Rich.
---
 m4/p2v-tests.m4 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/m4/p2v-tests.m4 b/m4/p2v-tests.m4
index f679bc4..7de356d 100644
--- a/m4/p2v-tests.m4
+++ b/m4/p2v-tests.m4
@@ -25,11 +25,12 @@ AC_ARG_ENABLE([gnulib-tests],
 AM_CONDITIONAL([ENABLE_GNULIB_TESTS],[test "x$ENABLE_GNULIB_TESTS" =
"xyes"])
 AC_MSG_RESULT([$ENABLE_GNULIB_TESTS])
 
-dnl Check libguestfs tools (needed for create the test images).
+dnl Check libguestfs tools.
 AC_CHECK_PROG([GUESTFISH],[guestfish],[guestfish],[no])
 AC_CHECK_PROG([VIRT_BUILDER],[virt-builder],[virt-builder],[no])
+AC_CHECK_PROG([VIRT_V2V],[virt-v2v],[virt-v2v],[no])
 AM_CONDITIONAL([HAVE_LIBGUESTFS],
-    [test "x$GUESTFISH" != "xno" && test
"x$VIRT_BUILDER" != "xno"])
+    [test "x$GUESTFISH" != "xno" && test
"x$VIRT_BUILDER" != "xno" && test
"x$VIRT_V2V" != "xno"])
 
 dnl Check for valgrind
 AC_CHECK_PROG([VALGRIND],[valgrind],[valgrind],[no])
-- 
2.21.0

On Thu, Sep 12, 2019 at 05:25:37PM +0200, Pino Toscano
wrote:
> virt-v2v is definitely used by the functional tests that run virt-p2v,
> so check for it, and require it for running those tests.
> 
> Reported by Rich.
> ---
>  m4/p2v-tests.m4 | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/m4/p2v-tests.m4 b/m4/p2v-tests.m4
> index f679bc4..7de356d 100644
> --- a/m4/p2v-tests.m4
> +++ b/m4/p2v-tests.m4
> @@ -25,11 +25,12 @@ AC_ARG_ENABLE([gnulib-tests],
>  AM_CONDITIONAL([ENABLE_GNULIB_TESTS],[test
"x$ENABLE_GNULIB_TESTS" = "xyes"])
>  AC_MSG_RESULT([$ENABLE_GNULIB_TESTS])
>  
> -dnl Check libguestfs tools (needed for create the test images).
> +dnl Check libguestfs tools.
>  AC_CHECK_PROG([GUESTFISH],[guestfish],[guestfish],[no])
>  AC_CHECK_PROG([VIRT_BUILDER],[virt-builder],[virt-builder],[no])
> +AC_CHECK_PROG([VIRT_V2V],[virt-v2v],[virt-v2v],[no])
>  AM_CONDITIONAL([HAVE_LIBGUESTFS],
> -    [test "x$GUESTFISH" != "xno" && test
"x$VIRT_BUILDER" != "xno"])
> +    [test "x$GUESTFISH" != "xno" && test
"x$VIRT_BUILDER" != "xno" && test
"x$VIRT_V2V" != "xno"])
>  
>  dnl Check for valgrind
>  AC_CHECK_PROG([VALGRIND],[valgrind],[valgrind],[no])
ACK, thanks.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/