[PATCH] v2v: -o rhv-upload: skip test-v2v-o-rhv-upload.sh w/o nbdkit
by Pino Toscano
-o rhv-upload requires nbdkit, so skip this test if it is not installed.
---
v2v/test-v2v-o-rhv-upload.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/v2v/test-v2v-o-rhv-upload.sh b/v2v/test-v2v-o-rhv-upload.sh
index 8bda7cc0b..29214a9db 100755
--- a/v2v/test-v2v-o-rhv-upload.sh
+++ b/v2v/test-v2v-o-rhv-upload.sh
@@ -28,6 +28,7 @@ set -x
$TEST_FUNCTIONS
skip_if_skipped
skip_if_backend uml
+skip_unless nbdkit file --version
skip_unless_phony_guest windows.img
libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests.xml"
--
2.17.1
6 years, 1 month
[supermin PATCH] rpm: support openSUSE Leap 15
by Pino Toscano
openSUSE Leap 15 has "opensuse-leap" as ID in os-release, so add it both
in the detection code of the RPM handler, and in test-harder.sh.
---
src/ph_rpm.ml | 2 +-
tests/test-harder.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml
index b0a5eb2..3caa38e 100644
--- a/src/ph_rpm.ml
+++ b/src/ph_rpm.ml
@@ -40,7 +40,7 @@ let fedora_detect () =
let opensuse_detect () =
Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () &&
Config.zypper <> "no" &&
- (List.mem (Os_release.get_id ()) [ "opensuse"; "sled"; "sles" ] ||
+ (List.mem (Os_release.get_id ()) [ "opensuse-leap"; "opensuse"; "sled"; "sles" ] ||
try (stat "/etc/SuSE-release").st_kind = S_REG with Unix_error _ -> false)
let mageia_detect () =
diff --git a/tests/test-harder.sh b/tests/test-harder.sh
index cfa448a..54362de 100755
--- a/tests/test-harder.sh
+++ b/tests/test-harder.sh
@@ -29,7 +29,7 @@ if [ -f /etc/os-release ]; then
distro=$(. /etc/os-release && echo $ID)
case "$distro" in
fedora|rhel|centos) distro=redhat ;;
- opensuse|sled|sles) distro=suse ;;
+ opensuse-leap|opensuse|sled|sles) distro=suse ;;
ubuntu) distro=debian ;;
esac
elif [ -f /etc/arch-release ]; then
--
2.17.1
6 years, 1 month
