From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 05DBF1382D5 for ; Mon, 27 Jun 2016 05:58:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4ACB1141E3; Mon, 27 Jun 2016 05:58:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ECA17141E3 for ; Mon, 27 Jun 2016 05:58:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B0B29340997 for ; Mon, 27 Jun 2016 05:58:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DEC21241B for ; Mon, 27 Jun 2016 05:58:23 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1467007094.831e3f05df898a0d3df1bbff8914ca28f08a95cb.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/tests/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/tests/tests-common.sh X-VCS-Directories: eclass/tests/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 831e3f05df898a0d3df1bbff8914ca28f08a95cb X-VCS-Branch: master Date: Mon, 27 Jun 2016 05:58:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8c4f2f59-0fe3-453d-9282-35f8ef1315be X-Archives-Hash: 132f9f07035b79deec9c605d594ac25c commit: 831e3f05df898a0d3df1bbff8914ca28f08a95cb Author: Michał Górny gentoo org> AuthorDate: Mon Jun 27 05:57:42 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jun 27 05:58:14 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=831e3f05 eclass/tests: Remove KV_* functions from tests-common.sh eclass/tests/tests-common.sh | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/eclass/tests/tests-common.sh b/eclass/tests/tests-common.sh index d3095e5..faca39d 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 $*"