From 86eadb4d7c77fbb6d872eb690bc2243338cfcc2d Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Tue, 3 Nov 2020 14:31:21 +0100 Subject: [PATCH] scripts/common: Change name of the cmp() function It could potentially override cmp binary, causing failures in some of the tests. Change-Id: Ia0bd88222c60e5b8a13d3809a6213b457b887b41 Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5005 Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins --- scripts/common.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/common.sh b/scripts/common.sh index 1c475954d..56369ff84 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -236,7 +236,7 @@ function nvme_in_userspace() { printf '%s\n' "${bdfs[@]}" } -cmp() { +cmp_versions() { local ver1 ver1_l local ver2 ver2_l @@ -277,9 +277,9 @@ cmp() { [[ ${ver1[*]} == "${ver2[*]}" ]] && return "$eq" } -lt() { cmp "$1" "<" "$2"; } -gt() { cmp "$1" ">" "$2"; } -le() { cmp "$1" "<=" "$2"; } -ge() { cmp "$1" ">=" "$2"; } -eq() { cmp "$1" "==" "$2"; } +lt() { cmp_versions "$1" "<" "$2"; } +gt() { cmp_versions "$1" ">" "$2"; } +le() { cmp_versions "$1" "<=" "$2"; } +ge() { cmp_versions "$1" ">=" "$2"; } +eq() { cmp_versions "$1" "==" "$2"; } neq() { ! eq "$1" "$2"; }