summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/xfstests.sh19
1 files changed, 10 insertions, 9 deletions
diff --git a/tests/xfstests.sh b/tests/xfstests.sh
index baa5aad..e55e815 100644
--- a/tests/xfstests.sh
+++ b/tests/xfstests.sh
@@ -69,14 +69,11 @@ run_xfstests()
wipefs -af ${ktest_scratch_dev[0]}
mkfs.$FSTYP $MKFS_OPTIONS -q ${ktest_scratch_dev[0]}
- touch /xfstests-init-done
- fi
-
- # mkfs.xfs 5.19 requires these variables to be exported into its
- # environment to allow sub-300MB filesystems for fstests.
- export TEST_DEV=${ktest_scratch_dev[0]}
- export TEST_DIR=/mnt/test
- cat << EOF > /ktest/tests/xfstests/local.config
+ # mkfs.xfs 5.19 requires these variables to be exported into its
+ # environment to allow sub-300MB filesystems for fstests.
+ export TEST_DEV=${ktest_scratch_dev[0]}
+ export TEST_DIR=/mnt/test
+ cat << EOF > /ktest/tests/xfstests/local.config
TEST_DEV=${ktest_scratch_dev[0]}
TEST_DIR=$TEST_DIR
SCRATCH_DEV=${ktest_scratch_dev[1]}
@@ -86,9 +83,13 @@ RESULT_BASE=/ktest-out/xfstests
LOGGER_PROG=true
EOF
+ touch /xfstests-init-done
+ fi
+
export MKFS_OPTIONS
+
mount -t $FSTYP ${ktest_scratch_dev[0]} /mnt/test
cd "$ktest_dir/tests/xfstests"
- ./check "$@"
+ ./check -d "$@"
}