v2v: ova: Further fix test cases.

Updates commit 7461a8fab1.
Fixes and partly reverts commit 8f91d3a9b0.
This commit is contained in:
Richard W.M. Jones
2017-02-10 12:54:56 +00:00
parent 2c340682b5
commit 0a8f95a222
6 changed files with 16 additions and 29 deletions

View File

@@ -54,22 +54,3 @@ do_sha256 ()
;;
esac
}
# Returns 0 if QEMU version is greater or equal to the arguments
qemu_is_version() {
if [ $# -ne 2 ] ; then
echo "Usage: $0 <major_version> <minor_version>" >&2
return 3
fi
[[ "$(qemu-img --version)" =~ 'qemu-img version '([0-9]+)\.([0-9]+) ]] || return 2
QMAJ=${BASH_REMATCH[1]}
QMIN=${BASH_REMATCH[2]}
if [ \( $QMAJ -gt $1 \) -o \( $QMAJ -eq $1 -a $QMIN -ge $2 \) ] ; then
return 0
fi
return 1
}