aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Schubert <bernd.schubert@fastmail.fm>2024-06-07 21:31:28 +0200
committerGitHub <noreply@github.com>2024-06-07 21:31:28 +0200
commit2105cd7724a714a874eb991f37f1ffdbed3256bd (patch)
treedd9117b987427f9a1116a27348b2c87f0635250c
parentdd5349a2cf77cd2e0fdbfa8c7fa828986e48f84f (diff)
downloadlibfuse-2105cd7724a714a874eb991f37f1ffdbed3256bd.tar.gz
xfstests: Add the possibility for extra daemon options (#964)
We need to test w/o page cache, w/o passthrough and other options. I.e. we need to have the possibility to add these options via local.config
-rw-r--r--xfstests/local.config3
-rwxr-xr-xxfstests/mount.fuse.passthrough4
2 files changed, 6 insertions, 1 deletions
diff --git a/xfstests/local.config b/xfstests/local.config
index 318f12c..c34ebb8 100644
--- a/xfstests/local.config
+++ b/xfstests/local.config
@@ -9,6 +9,9 @@ export FUSE_SUBTYP=.passthrough
export MOUNT_OPTIONS=""
export TEST_FS_MOUNT_OPTS=""
+# extra binary options, such as '--direct-io' or '--nopassthrough', etc
+export EXTRA_BIN_OPTIONS=""
+
# If PASSTHROUGH_PATH is unset, the mount helper is going to look
# for the binary '${FUSE_SUBTYP}', though omitting the leading dot '.'.
# Example:
diff --git a/xfstests/mount.fuse.passthrough b/xfstests/mount.fuse.passthrough
index b19d27f..e07430f 100755
--- a/xfstests/mount.fuse.passthrough
+++ b/xfstests/mount.fuse.passthrough
@@ -35,4 +35,6 @@ fi
[ -n "$PASSTHROUGH_PATH" ] || PASSTHROUGH_PATH=${0#*mount.fuse.}
-exec "$PASSTHROUGH_PATH" -o fsname=$dev,allow_other $source "$mnt" -o "$mntopts" "$@"
+#echo "EXTRA_BIN_OPTIONS='${EXTRA_BIN_OPTIONS}'"
+
+exec "$PASSTHROUGH_PATH" ${EXTRA_BIN_OPTIONS} -o fsname=$dev,allow_other $source "$mnt" -o "$mntopts" "$@"