commit: c9ee2e478f60420147a7c770585fc883aaf49141
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 8 11:11:00 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 8 11:11:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9ee2e47
eapi7-ver.eclass: Update func names in tests
eclass/tests/eapi7-ver.sh | 70 ++++++++++++++++++-------------------
eclass/tests/eapi7-ver:benchmark.sh | 44 +++++++++++------------
2 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/eclass/tests/eapi7-ver.sh b/eclass/tests/eapi7-ver.sh
index 0f39f483b90..8a96e4d29b1 100755
--- a/eclass/tests/eapi7-ver.sh
+++ b/eclass/tests/eapi7-ver.sh
@@ -24,42 +24,42 @@ txf() {
tend ${?} "function did not die"
}
-teq 1 version_cut 1 1.2.3
-teq 1 version_cut 1-1 1.2.3
-teq 1.2 version_cut 1-2 1.2.3
-teq 2.3 version_cut 2- 1.2.3
-teq 1.2.3 version_cut 1- 1.2.3
-teq 3b version_cut 3-4 1.2.3b_alpha4
-teq alpha version_cut 5 1.2.3b_alpha4
-teq 1.2 version_cut 1-2 .1.2.3
-teq .1.2 version_cut 0-2 .1.2.3
-teq 2.3 version_cut 2-3 1.2.3.
-teq 2.3. version_cut 2- 1.2.3.
-teq 2.3. version_cut 2-4 1.2.3.
+teq 1 ver_cut 1 1.2.3
+teq 1 ver_cut 1-1 1.2.3
+teq 1.2 ver_cut 1-2 1.2.3
+teq 2.3 ver_cut 2- 1.2.3
+teq 1.2.3 ver_cut 1- 1.2.3
+teq 3b ver_cut 3-4 1.2.3b_alpha4
+teq alpha ver_cut 5 1.2.3b_alpha4
+teq 1.2 ver_cut 1-2 .1.2.3
+teq .1.2 ver_cut 0-2 .1.2.3
+teq 2.3 ver_cut 2-3 1.2.3.
+teq 2.3. ver_cut 2- 1.2.3.
+teq 2.3. ver_cut 2-4 1.2.3.
-teq 1-2.3 version_rs 1 - 1.2.3
-teq 1.2-3 version_rs 2 - 1.2.3
-teq 1-2-3.4 version_rs 1-2 - 1.2.3.4
-teq 1.2-3-4 version_rs 2- - 1.2.3.4
-teq 1.2.3 version_rs 2 . 1.2-3
-teq 1.2.3.a version_rs 3 . 1.2.3a
-teq 1.2-alpha-4 version_rs 2-3 - 1.2_alpha4
-teq 1.23-b_alpha4 version_rs 3 - 2 "" 1.2.3b_alpha4
-teq a1b_2-c-3-d4e5 version_rs 3-5 _ 4-6 - a1b2c3d4e5
-teq .1-2.3 version_rs 1 - .1.2.3
-teq -1.2.3 version_rs 0 - .1.2.3
+teq 1-2.3 ver_rs 1 - 1.2.3
+teq 1.2-3 ver_rs 2 - 1.2.3
+teq 1-2-3.4 ver_rs 1-2 - 1.2.3.4
+teq 1.2-3-4 ver_rs 2- - 1.2.3.4
+teq 1.2.3 ver_rs 2 . 1.2-3
+teq 1.2.3.a ver_rs 3 . 1.2.3a
+teq 1.2-alpha-4 ver_rs 2-3 - 1.2_alpha4
+teq 1.23-b_alpha4 ver_rs 3 - 2 "" 1.2.3b_alpha4
+teq a1b_2-c-3-d4e5 ver_rs 3-5 _ 4-6 - a1b2c3d4e5
+teq .1-2.3 ver_rs 1 - .1.2.3
+teq -1.2.3 ver_rs 0 - .1.2.3
# truncating range
-teq 1.2 version_cut 0-2 1.2.3
-teq 2.3 version_cut 2-5 1.2.3
-teq "" version_cut 4 1.2.3
-teq "" version_cut 0 1.2.3
-teq "" version_cut 4- 1.2.3
-teq 1.2.3 version_rs 0 - 1.2.3
-teq 1.2.3 version_rs 3 . 1.2.3
-teq 1.2.3 version_rs 3- . 1.2.3
-teq 1.2.3 version_rs 3-5 . 1.2.3
+teq 1.2 ver_cut 0-2 1.2.3
+teq 2.3 ver_cut 2-5 1.2.3
+teq "" ver_cut 4 1.2.3
+teq "" ver_cut 0 1.2.3
+teq "" ver_cut 4- 1.2.3
+teq 1.2.3 ver_rs 0 - 1.2.3
+teq 1.2.3 ver_rs 3 . 1.2.3
+teq 1.2.3 ver_rs 3- . 1.2.3
+teq 1.2.3 ver_rs 3-5 . 1.2.3
-txf version_cut foo 1.2.3
-txf version_rs -3 _ a1b2c3d4e5
-txf version_rs 5-3 _ a1b2c3d4e5
+txf ver_cut foo 1.2.3
+txf ver_rs -3 _ a1b2c3d4e5
+txf ver_rs 5-3 _ a1b2c3d4e5
diff --git a/eclass/tests/eapi7-ver:benchmark.sh
b/eclass/tests/eapi7-ver:benchmark.sh
index 7adcf91cd7d..4b262ab6acc 100755
--- a/eclass/tests/eapi7-ver:benchmark.sh
+++ b/eclass/tests/eapi7-ver:benchmark.sh
@@ -11,34 +11,34 @@ inherit eapi7-ver
cutting() {
local x
for x in {1..1000}; do
- version_cut 1 1.2.3
- version_cut 1-2 1.2.3
- version_cut 2- 1.2.3
- version_cut 1- 1.2.3
- version_cut 3-4 1.2.3b_alpha4
- version_cut 5 1.2.3b_alpha4
- version_cut 1-2 .1.2.3
- version_cut 0-2 .1.2.3
- version_cut 2-3 1.2.3.
- version_cut 2- 1.2.3.
- version_cut 2-4 1.2.3.
+ ver_cut 1 1.2.3
+ ver_cut 1-2 1.2.3
+ ver_cut 2- 1.2.3
+ ver_cut 1- 1.2.3
+ ver_cut 3-4 1.2.3b_alpha4
+ ver_cut 5 1.2.3b_alpha4
+ ver_cut 1-2 .1.2.3
+ ver_cut 0-2 .1.2.3
+ ver_cut 2-3 1.2.3.
+ ver_cut 2- 1.2.3.
+ ver_cut 2-4 1.2.3.
done >/dev/null
}
replacing() {
local x
for x in {1..1000}; do
- version_rs 1 - 1.2.3
- version_rs 2 - 1.2.3
- version_rs 1-2 - 1.2.3.4
- version_rs 2- - 1.2.3.4
- version_rs 2 . 1.2-3
- version_rs 3 . 1.2.3a
- version_rs 2-3 - 1.2_alpha4
- version_rs 3 - 2 "" 1.2.3b_alpha4
- version_rs 3-5 _ 4-6 - a1b2c3d4e5
- version_rs 1 - .1.2.3
- version_rs 0 - .1.2.3
+ ver_rs 1 - 1.2.3
+ ver_rs 2 - 1.2.3
+ ver_rs 1-2 - 1.2.3.4
+ ver_rs 2- - 1.2.3.4
+ ver_rs 2 . 1.2-3
+ ver_rs 3 . 1.2.3a
+ ver_rs 2-3 - 1.2_alpha4
+ ver_rs 3 - 2 "" 1.2.3b_alpha4
+ ver_rs 3-5 _ 4-6 - a1b2c3d4e5
+ ver_rs 1 - .1.2.3
+ ver_rs 0 - .1.2.3
done >/dev/null
}
