Commit 86eadb4d authored by Michal Berger's avatar Michal Berger Committed by Jim Harris
Browse files

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: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5005


Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 42ec403b

scripts/common.sh

+6 −6
Original line number Diff line number Diff line
@@ -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"; }