From 85bf4c81a4f9114eebab1891862326e362da7ebd Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Thu, 8 Jul 2021 09:48:41 +0200 Subject: [PATCH] autotest_common: Simplify check for libiscsi's API version This is done to get rid of this: autotest_common.sh: line 384: [: -ge: unary operator expected This happens for older libiscsi which doesn't define LIBISCSI_API_VERSION in the iscsi.h. Signed-off-by: Michal Berger Change-Id: I658ab2936e161d648fc301fadcc510b84a61d916 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8710 Tested-by: SPDK CI Jenkins Community-CI: Broadcom CI Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Reviewed-by: Karol Latecki --- test/common/autotest_common.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh index 2ea1c8383..f68dcbfe4 100755 --- a/test/common/autotest_common.sh +++ b/test/common/autotest_common.sh @@ -378,8 +378,9 @@ function get_config_params() { fi if [ -d /usr/include/iscsi ]; then - libiscsi_version=$(grep LIBISCSI_API_VERSION /usr/include/iscsi/iscsi.h | head -1 | awk '{print $3}' | awk -F '(' '{print $2}' | awk -F ')' '{print $1}') - if [ $libiscsi_version -ge 20150621 ]; then + [[ $(< /usr/include/iscsi/iscsi.h) =~ "define LIBISCSI_API_VERSION ("([0-9]+)")" ]] \ + && libiscsi_version=${BASH_REMATCH[1]} + if ((libiscsi_version >= 20150621)); then config_params+=' --with-iscsi-initiator' fi fi