From 28cca57774b1d11ce3c7d41d51327f47375028a6 Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Mon, 4 Nov 2024 07:41:45 +0300 Subject: [PATCH] LU-18419 tests: use ior when installed try to find both ior and IOR. Test-Parameters: trivial Signed-off-by: Alex Zhuravlev Change-Id: Ief3effd7cab542195a8f7aff77fb58ea57a71469 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56874 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- lustre/tests/functions.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lustre/tests/functions.sh b/lustre/tests/functions.sh index de86b5f..605f210 100644 --- 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} -- 1.8.3.1