apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

common/config: unset TEST_FS_MOUNT_OPTS across config sections

Browse Source 
TEST_FS_MOUNT_OPTS doesn't get reset before parsing next config
section, this will cause unexpected TEST_FS_MOUNT_OPTS in test,
because it can be assigned some fs-specific mount options in
_test_mount_opts, which might not be supported by the filesystem in
next config section. And MOUNT_OPTIONS is reset, I don't see why
TEST_FS_MOUNT_OPTS shouldn't be.

Also update README.config-sections to reflect this change and fix
typos (replace MOUNT_OPTIONS with TEST_FS_MOUNT_OPTS).

Reviewed-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Eryu Guan
2017-08-02 21:49:00 +08:00
parent 81aa85deac
commit 65e0cd588d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.config-sections
+5 -5
View File
@@ -40,8 +40,8 @@ Different mount options
-----------------------
Specifying different mount options in difference config sections is allowed.
When MOUNT_OPTIONS differs in the following section TEST_DEV will be remounted
with new MOUNT_OPTIONS automatically before running the test.
When TEST_FS_MOUNT_OPTS differs in the following section TEST_DEV will be
remounted with new TEST_FS_MOUNT_OPTS automatically before running the test.
Multiple file systems
@@ -51,9 +51,9 @@ Having different file systems in different config sections is allowed. When
FSTYP differs in the following section the FSTYP file system will be created
automatically before running the test.
Note that if MOUNT_OPTIONS, MKFS_OPTIONS, or FSCK_OPTIONS are not directly
specified in the section it will be reset to the default for a given file
system.
Note that if TEST_FS_MOUNT_OPTS, MOUNT_OPTIONS, MKFS_OPTIONS, or FSCK_OPTIONS
are not directly specified in the section it will be reset to the default for a
given file system.
You can also force the file system recreation by specifying RECREATE_TEST_DEV.
common/config
+1
View File
@@ -602,6 +602,7 @@ get_next_config() {
local OLD_USE_EXTERNAL=$USE_EXTERNAL
unset MOUNT_OPTIONS
unset TEST_FS_MOUNT_OPTS
unset MKFS_OPTIONS
unset FSCK_OPTIONS
unset USE_EXTERNAL