f2fs/015: clear MKFS_OPTIONS and MOUNT_OPTIONS

Currently, residual options can interfere with checking the mount
behavior of the listed MKFS_OPTIONS and MOUNT_OPTIONS. For example,
"Option#120: test_dummy_encryption" should fail with the listed
options but succeeds if “MKFS_OPTIONS=encrypt” is preset. By
explicitly clearing MKFS_OPTIONS and MOUNT_OPTIONS, the test’s
reliability can be improved.

f2fs/015.out is also updated to expect failure for cases that require
additional mkfs attributes to mount.

Signed-off-by: Joanne Chang <joannechien@google.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/f2fs/015 b/tests/f2fs/015
index 73ac3d82d658988435e5e4d54b731dc9a1c1cf1f..6a7a582cea83cc7c0048b8412bf07bbdab6d7cfe 100755 (executable)
--- a/tests/f2fs/015
+++ b/tests/f2fs/015
@@ -103,6 +103,9 @@ options=(
        "norecovery,ro"                 ""                      \
 )
 
+# remove all mkfs/mount options to avoid affecting results
+export MKFS_OPTIONS=""
+export MOUNT_OPTIONS=""
 for ((i=0;i<${#options[@]};i=i+2))
 do
        echo "Option#$i: ${options[$i]} : ${options[$((i+1))]}"

diff --git a/tests/f2fs/015.out b/tests/f2fs/015.out
index 8d6712f0a5d14800eeb7a4d71e3f17811749066a..3df29436159bc99c1dbbbc994add89e33e608623 100644 (file)
--- a/tests/f2fs/015.out
+++ b/tests/f2fs/015.out
@@ -38,7 +38,7 @@ Option#34: inline_xattr :
 Option#36: noinline_xattr : 
 0
 Option#38: inline_xattr_size=400 : 
-0
+32
 Option#40: inline_data : 
 0
 Option#42: noinline_dentry : 
@@ -120,11 +120,11 @@ Option#116: fsync_mode=strict :
 Option#118: fsync_mode=nobarrier : 
 0
 Option#120: test_dummy_encryption : 
-0
+32
 Option#122: test_dummy_encryption=v1 : 
-0
+32
 Option#124: test_dummy_encryption=v2 : 
-0
+32
 Option#126: checkpoint=enable : 
 0
 Option#128: checkpoint=disable :