From: Elena Gryaznova <elena.gryaznova@hpe.com>
Date: Tue, 25 Jun 2024 10:08:27 +0000 (+0300)
Subject: LU-17975 tests: execvp error on file write_append_truncate
X-Git-Tag: 2.15.65~121
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=f2e544034c083f46f834f6df419882f53882931b;p=fs%2Flustre-release.git

LU-17975 tests: execvp error on file write_append_truncate

test fails on sles15sp4 clients due to write_append_truncate
not found:
  execvp error on file write_append_truncate
    (No such file or directory)

HPE-bug-id: LUS-8427
Test-Parameters: trivial testlist=parallel-scale env=ONLY=write_append_truncate
Signed-off-by: Elena Gryaznova <elena.gryaznova@hpe.com>
Reviewed-by: Alexander Boyko <alexander.boyko@hpe.com>
Reviewed-by: Alexander Zarochentsev <alexander.zarochentsev@hpe.com>
Change-Id: I88a5a6c30510dff19b59d32eca2a90566a21f64e
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55530
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/functions.sh b/lustre/tests/functions.sh
index d0771f2..e741a87 100644
--- a/lustre/tests/functions.sh
+++ b/lustre/tests/functions.sh
@@ -792,9 +792,10 @@ run_cascading_rw() {
 run_write_append_truncate() {
 	[ "$NFSCLIENT" ] && skip "skipped for NFSCLIENT mode"
 	# location is lustre/tests dir
-	if ! which write_append_truncate > /dev/null 2>&1 ; then
+	WRITE_APPEND_TRUNCATE=${WRITE_APPEND_TRUNCATE:-$(which \
+		write_append_truncate 2> /dev/null || true)}
+	[[ -n "$WRITE_APPEND_TRUNCATE" ]] ||
 		skip_env "write_append_truncate not found"
-	fi
 
 	# threads per client
 	write_THREADS=${write_THREADS:-8}
@@ -814,7 +815,7 @@ run_write_append_truncate() {
 
 	chmod 0777 $testdir
 
-	local cmd="write_append_truncate -n $write_REP $file"
+	local cmd="$WRITE_APPEND_TRUNCATE -n $write_REP $file"
 
 	echo "+ $cmd"
 	mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} \