[Libguestfs] [v2v PATCH 2/3] Revert "tests: rhv-upload: Fix skip test of nbdkit python plugin."

It will be fixed in an easier way. This reverts commit 04bb355d5c581e803585d80e786f5811f2144aac. --- .gitignore | 1 - configure.ac | 2 -- tests/Makefile.am | 1 + .../{test-v2v-o-rhv-upload.sh.in => test-v2v-o-rhv-upload.sh} | 3 +-- 4 files changed, 2 insertions(+), 5 deletions(-) rename tests/{test-v2v-o-rhv-upload.sh.in => test-v2v-o-rhv-upload.sh} (95%) diff --git a/.gitignore b/.gitignore index 54e5b0ec..846998b3 100644 --- a/.gitignore +++ b/.gitignore @@ -127,7 +127,6 @@ 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 1b8f6a83..065c6289 100644 --- a/configure.ac +++ b/configure.ac @@ -97,8 +97,6 @@ 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 0f004d19..3d59eb6a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -88,6 +88,7 @@ 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.in b/tests/test-v2v-o-rhv-upload.sh similarity index 95% rename from tests/test-v2v-o-rhv-upload.sh.in rename to tests/test-v2v-o-rhv-upload.sh index 4f2b240e..a2f5b0d5 100755 --- a/tests/test-v2v-o-rhv-upload.sh.in +++ b/tests/test-v2v-o-rhv-upload.sh @@ -1,5 +1,4 @@ #!/bin/bash - -# @configure_input@ # libguestfs virt-v2v test script # Copyright (C) 2018 Red Hat Inc. # @@ -30,7 +29,7 @@ $TEST_FUNCTIONS skip_if_skipped skip_if_backend uml skip_unless python3 --version -skip_unless nbdkit @VIRT_V2V_NBDKIT_PYTHON_PLUGIN@ --version +skip_unless nbdkit python3 --version skip_unless_phony_guest windows.img libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests.xml" -- 2.23.0