[Libguestfs] [PATCH] tests: rhv-upload: Require nbdkit python plugin

[Richard W.M. Jones]

This will break for people using
./configure --with-virt-v2v-nbdkit-python-plugin=...

We could probably drop that option, but that complicated RHEL.
Otherwise the rather more complicated patch attached is needed.

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
-------------- next part --------------
>From 57a2d65bc5bb2f5dd0f47e8cd7ebd0d67f1f8aef Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Fri, 29 Nov 2019 08:00:03 +0000
Subject: [PATCH] tests: rhv-upload: Fix skip test of nbdkit python plugin.

---
 .gitignore                                                     | 1 +
 configure.ac                                                   | 2 ++
 tests/Makefile.am                                              | 1 -
 .../{test-v2v-o-rhv-upload.sh => test-v2v-o-rhv-upload.sh.in}  | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)
 rename tests/{test-v2v-o-rhv-upload.sh => test-v2v-o-rhv-upload.sh.in} (95%)

diff --git a/.gitignore b/.gitignore
index e0804cc5b..19ee3335c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,6 +126,7 @@ Makefile.in
 /test-harness/virt-v2v-test-harness.1
 /tests/libvirt-is-version
 /tests/test-v2v-conversion-of-*.sh
+/tests/test-v2v-o-rhv-upload.sh
 /tests/windows.vmdk
 /v2v/.depend
 /v2v/config.ml
diff --git a/configure.ac b/configure.ac
index fa8933801..eeeca845a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,6 +97,8 @@ AC_CONFIG_FILES([podwrapper.pl],
                 [chmod +x,-w podwrapper.pl])
 AC_CONFIG_FILES([run],
                 [chmod +x,-w run])
+AC_CONFIG_FILES([tests/test-v2v-o-rhv-upload.sh],
+                [chmod +x,-w tests/test-v2v-o-rhv-upload.sh])
 
 dnl NB: Remove common/mlstdutils/guestfs_config.ml in future XXX
 AC_CONFIG_FILES([Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c546c31b9..41fd24bf3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -90,7 +90,6 @@ TESTS = \
 	test-v2v-o-openstack.sh \
 	test-v2v-o-qemu.sh \
 	test-v2v-o-rhv.sh \
-	test-v2v-o-rhv-upload.sh \
 	test-v2v-o-vdsm-options.sh \
 	test-v2v-oa-option.sh \
 	test-v2v-of-option.sh \
diff --git a/tests/test-v2v-o-rhv-upload.sh b/tests/test-v2v-o-rhv-upload.sh.in
similarity index 95%
rename from tests/test-v2v-o-rhv-upload.sh
rename to tests/test-v2v-o-rhv-upload.sh.in
index a2f5b0d5e..4f2b240ec 100755
--- a/tests/test-v2v-o-rhv-upload.sh
+++ b/tests/test-v2v-o-rhv-upload.sh.in
@@ -1,4 +1,5 @@
 #!/bin/bash -
+# @configure_input@
 # libguestfs virt-v2v test script
 # Copyright (C) 2018 Red Hat Inc.
 #
@@ -29,7 +30,7 @@ $TEST_FUNCTIONS
 skip_if_skipped
 skip_if_backend uml
 skip_unless python3 --version
-skip_unless nbdkit python3 --version
+skip_unless nbdkit @VIRT_V2V_NBDKIT_PYTHON_PLUGIN@ --version
 skip_unless_phony_guest windows.img
 
 libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests.xml"
-- 
2.23.0