From 715196f7c2107cea45d2055ab26431ace88a20bb Mon Sep 17 00:00:00 2001
From: Cheng Lingfei <1599101385@qq.com>
Date: Wed, 20 May 2026 22:26:11 +0800
Subject: [PATCH] lkl tests: avoid variable test names in lklfuse.sh

Same issue commit 8b61f603155f ("lkl tests: avoid variable test names")
fixed for disk.sh: lklfuse.sh passes the random mktemp paths $file/$dir
/$lock_file as arguments to lkl_test_run, which embeds them into the test
name. The GitHub test reporter then sees 64 "removed" and 64 "added"
tests on every CI run because the temp paths differ run to run.
See https://github.com/lkl/linux/pull/635#issuecomment-4497081798.

Drop the random-path arguments from lkl_test_run calls and reference
the outer-scope $file/$dir/$lock_file directly inside each function.
$fstype stays as an argument since it is stable across runs.

Also update the commented-out stress-ng call so a future uncomment
does not re-introduce the issue.

Signed-off-by: Cheng Lingfei <1599101385@qq.com>
---
 tools/lkl/tests/lklfuse.sh | 40 +++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/tools/lkl/tests/lklfuse.sh b/tools/lkl/tests/lklfuse.sh
index 093c90f883cec3..df160279792b89 100755
--- a/tools/lkl/tests/lklfuse.sh
+++ b/tools/lkl/tests/lklfuse.sh
@@ -17,32 +17,27 @@ cleanup()
     rmdir $dir
 }
 
-# $1 - disk image
-# $2 - fstype
+# $1 - fstype
 function prepfs()
 {
     set -e
 
-    dd if=/dev/zero of=$1 bs=1048576 count=300
+    dd if=/dev/zero of=$file bs=1048576 count=300
 
-    yes | mkfs.$2 $1
+    yes | mkfs.$1 $file
 }
 
-# $1 - disk image
-# $2 - mount point
-# $3 - filesystem type
-# $4 - lock file
+# $1 - filesystem type
 lklfuse_mount()
 {
-    ${script_dir}/../lklfuse $1 $2 -o type=$3,lock=$4
+    ${script_dir}/../lklfuse $file $dir -o type=$1,lock=$lock_file
 }
 
-# $1 - mount point
 lklfuse_basic()
 {
     set -e
 
-    cd $1
+    cd $dir
     touch a
     if ! [ -e ]; then exit 1; fi
     rm a
@@ -51,8 +46,7 @@ lklfuse_basic()
     rmdir a
 }
 
-# $1 - dir
-# $2 - filesystem type
+# $1 - filesystem type
 lklfuse_stressng()
 {
     set -e
@@ -62,9 +56,9 @@ lklfuse_stressng()
         return $TEST_SKIP
     fi
 
-    cd $1
+    cd $dir
 
-    if [ "$2" = "vfat" ]; then
+    if [ "$1" = "vfat" ]; then
         exclude="chmod,filename,link,mknod,symlink,xattr"
     fi
 
@@ -73,16 +67,14 @@ lklfuse_stressng()
 	      --sync-file-bytes 10m
 }
 
-# $1 - disk image
-# $2 - filesystem type
-# $3 - lock file
+# $1 - filesystem type
 lklfuse_lock_conflict()
 {
     local ret=$TEST_FAILURE unused_mnt=`mktemp -d`
 
     set +e
     # assume lklfuse already running with same lock file, causing lock conflict
-    ${script_dir}/../lklfuse -f $1 $unused_mnt -o type=$2,lock=$3
+    ${script_dir}/../lklfuse -f $file $unused_mnt -o type=$1,lock=$lock_file
     [ $? -eq 2 ] && ret=$TEST_SUCCESS
     rmdir "$unused_mnt"
     return $ret
@@ -124,11 +116,11 @@ trap cleanup EXIT
 
 lkl_test_plan 5 "lklfuse $fstype"
 
-lkl_test_run 1 prepfs $file $fstype
-lkl_test_run 2 lklfuse_mount $file $dir $fstype $lock_file
-lkl_test_run 3 lklfuse_basic $dir
+lkl_test_run 1 prepfs $fstype
+lkl_test_run 2 lklfuse_mount $fstype
+lkl_test_run 3 lklfuse_basic
 # stress-ng returns 2 with no apparent failures so skip it for now
-#lkl_test_run 4 lklfuse_stressng $dir $fstype
-lkl_test_run 4 lklfuse_lock_conflict $file $fstype $lock_file
+#lkl_test_run 4 lklfuse_stressng $fstype
+lkl_test_run 4 lklfuse_lock_conflict $fstype
 trap : EXIT
 lkl_test_run 5 cleanup