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

diff --git a/xfstests/local.config b/xfstests/local.config
index 318f12c39cc4544045aa5ec24350a7309672a72a..c34ebb8fbcab977a54434e6b09c2d5ea23940cc0 100644 (file)
--- 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 b19d27fbee2bca20bd4c6ceaf2bd73e7def33771..e07430f11731866196562a4defd7d75f4328e09d 100755 (executable)
--- 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" "$@"