From: Michał Górny Date: Mon, 27 Jun 2016 05:57:42 +0000 (+0200) Subject: eclass/tests: Remove KV_* functions from tests-common.sh X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=831e3f05df898a0d3df1bbff8914ca28f08a95cb;p=gentoo.git eclass/tests: Remove KV_* functions from tests-common.sh --- diff --git a/eclass/tests/tests-common.sh b/eclass/tests/tests-common.sh index d3095e5fc350..faca39d57589 100644 --- a/eclass/tests/tests-common.sh +++ b/eclass/tests/tests-common.sh @@ -65,47 +65,6 @@ has_version() { portageq has_version / "$@" } -KV_major() { - [[ -z $1 ]] && return 1 - - local KV=$@ - echo "${KV%%.*}" -} - -KV_minor() { - [[ -z $1 ]] && return 1 - - local KV=$@ - KV=${KV#*.} - echo "${KV%%.*}" -} - -KV_micro() { - [[ -z $1 ]] && return 1 - - local KV=$@ - KV=${KV#*.*.} - echo "${KV%%[^[:digit:]]*}" -} - -KV_to_int() { - [[ -z $1 ]] && return 1 - - local KV_MAJOR=$(KV_major "$1") - local KV_MINOR=$(KV_minor "$1") - local KV_MICRO=$(KV_micro "$1") - local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO )) - - # We make version 2.2.0 the minimum version we will handle as - # a sanity check ... if its less, we fail ... - if [[ ${KV_int} -ge 131584 ]] ; then - echo "${KV_int}" - return 0 - fi - - return 1 -} - tret=0 tbegin() { ebegin "Testing $*"