From 0e5fb021a2b05e0e49877bd62f6a87068f23747d Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Fri, 13 Nov 2020 12:15:20 -0800 Subject: [PATCH] scoutfs-tests: xfstests.sh: Changes for metadata device for scratch dev Change MOUNT_OPTIONS and define SCOUTFS_SCRATCH_MOUNT_OPTIONS. Signed-off-by: Andy Grover [zab@versity.com: minor comment fixes] --- tests/tests/xfstests.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/tests/xfstests.sh b/tests/tests/xfstests.sh index 8e1a20ef..8dfeba7b 100644 --- a/tests/tests/xfstests.sh +++ b/tests/tests/xfstests.sh @@ -42,11 +42,12 @@ export FSTYP=scoutfs export MKFS_OPTIONS="-Q 1" export TEST_DEV=$T_DB0 export TEST_DIR=$T_M0 -export SCRATCH_DEV=$T_EXDEV +export SCRATCH_META_DEV=$T_EX_META_DEV +export SCRATCH_DEV=$T_EX_DATA_DEV export SCRATCH_MNT="$T_TMPDIR/mnt.scratch" -export MOUNT_OPTIONS="-o server_addr=127.0.0.1" -# is this needed? -export TEST_FS_MOUNT_OPTS="-o server_addr=127.0.0.1" +export SCOUTFS_SCRATCH_MOUNT_OPTIONS="-o server_addr=127.0.0.1,metadev_path=$T_EX_META_DEV" +export MOUNT_OPTIONS="-o server_addr=127.0.0.1,metadev_path=$T_MB0" +export TEST_FS_MOUNT_OPTS="-o server_addr=127.0.0.1,metadev_path=$T_MB0" EOF cat << EOF > local.exclude