LU-18419 tests: use ior when installed

try to find both ior and IOR.

Test-Parameters: trivial
Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Change-Id: Ief3effd7cab542195a8f7aff77fb58ea57a71469
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56874
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/functions.sh b/lustre/tests/functions.sh
index de86b5f..605f210 100644 (file)
--- a/lustre/tests/functions.sh
+++ b/lustre/tests/functions.sh
@@ -626,8 +626,9 @@ run_ior() {
                                "is not set!" && return 1; }
        fi
 
-       IOR=${IOR:-$(which IOR 2> /dev/null || true)}
-       [ x$IOR = x ] && skip_env "IOR not found"
+       IOR=${IOR:-$(which ior 2> /dev/null)}
+       [[ -z "$IOR" ]] && IOR=$(which IOR 2> /dev/null)
+       [[ -n "$IOR" ]] || skip_env "IOR/ior not found"
 
        # threads per client
        ior_THREADS=${ior_THREADS:-2}