38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 3f8897aa36a723fe3fde5b62a6eb9ade427f77b2 Mon Sep 17 00:00:00 2001
|
|
From: Pino Toscano <ptoscano@redhat.com>
|
|
Date: Mon, 16 Dec 2019 10:58:38 +0100
|
|
Subject: [PATCH] tests: use the right nbdkit python3 plugin
|
|
|
|
Add the configure result in config.sh, so it can be used as variable.
|
|
---
|
|
config.sh.in | 2 ++
|
|
tests/test-v2v-o-rhv-upload.sh | 2 +-
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/config.sh.in b/config.sh.in
|
|
index 061871a3c..f32453792 100644
|
|
--- a/config.sh.in
|
|
+++ b/config.sh.in
|
|
@@ -18,3 +18,5 @@
|
|
|
|
# This shell script contains the results of some configure checks,
|
|
# mostly used in other shell scripts.
|
|
+
|
|
+export VIRT_V2V_NBDKIT_PYTHON_PLUGIN="@VIRT_V2V_NBDKIT_PYTHON_PLUGIN@"
|
|
diff --git a/tests/test-v2v-o-rhv-upload.sh b/tests/test-v2v-o-rhv-upload.sh
|
|
index a2f5b0d5e..e70575c70 100755
|
|
--- a/tests/test-v2v-o-rhv-upload.sh
|
|
+++ b/tests/test-v2v-o-rhv-upload.sh
|
|
@@ -29,7 +29,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.24.1
|
|
|