f2fs/015: Test correct mkfs options for error cases

Let's add the required mkfs options for quota mount option cases with
wrong results.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Co-developed-by: Joanne Chang <joannechien@google.com>
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 6a7a582cea83cc7c0048b8412bf07bbdab6d7cfe..81ea981833f29a2c1d63c77a39a8aa7a5e58e085 100755 (executable)
--- a/tests/f2fs/015
+++ b/tests/f2fs/015
@@ -59,15 +59,19 @@ options=(
        "usrquota"                      ""                      \
        "grpquota"                      ""                      \
        "prjquota"                      ""                      \
-       "usrjquota=ausrquota"           ""                      \
-       "grpjquota=agrpquota"           ""                      \
-       "prjjquota=aprjquota"           ""                      \
+       "prjquota"                      "extra_attr,quota,project_quota"        \
        "jqfmt=vfsold"                  ""                      \
        "jqfmt=vfsv0"                   ""                      \
        "jqfmt=vfsv1"                   ""                      \
+       "usrjquota=ausrquota"           ""                      \
+       "grpjquota=agrpquota"           ""                      \
+       "prjjquota=aprjquota"           ""                      \
        "usrjquota="                    ""                      \
        "grpjquota="                    ""                      \
        "prjjquota="                    ""                      \
+       "usrjquota=ausrquota"           "extra_attr,quota,project_quota"        \
+       "grpjquota=agrpquota"           "extra_attr,quota,project_quota"        \
+       "prjjquota=aprjquota"           "extra_attr,quota,project_quota"        \
        "quota"                         ""                      \
        "noquota"                       ""                      \
        "alloc_mode=reuse"              ""                      \

diff --git a/tests/f2fs/015.out b/tests/f2fs/015.out
index 3df29436159bc99c1dbbbc994add89e33e608623..cd273550065f33c54fa58541ad1a87ec31e89697 100644 (file)
--- a/tests/f2fs/015.out
+++ b/tests/f2fs/015.out
@@ -87,87 +87,95 @@ Option#84: grpquota :
 0
 Option#86: prjquota : 
 32
-Option#88: usrjquota=ausrquota : 
+Option#88: prjquota : extra_attr,quota,project_quota
+0
+Option#90: jqfmt=vfsold : 
+0
+Option#92: jqfmt=vfsv0 : 
+0
+Option#94: jqfmt=vfsv1 : 
+0
+Option#96: usrjquota=ausrquota : 
 32
-Option#90: grpjquota=agrpquota : 
+Option#98: grpjquota=agrpquota : 
 32
-Option#92: prjjquota=aprjquota : 
+Option#100: prjjquota=aprjquota : 
 32
-Option#94: jqfmt=vfsold : 
+Option#102: usrjquota= : 
 0
-Option#96: jqfmt=vfsv0 : 
+Option#104: grpjquota= : 
 0
-Option#98: jqfmt=vfsv1 : 
+Option#106: prjjquota= : 
 0
-Option#100: usrjquota= : 
+Option#108: usrjquota=ausrquota : extra_attr,quota,project_quota
 0
-Option#102: grpjquota= : 
+Option#110: grpjquota=agrpquota : extra_attr,quota,project_quota
 0
-Option#104: prjjquota= : 
+Option#112: prjjquota=aprjquota : extra_attr,quota,project_quota
 0
-Option#106: quota : 
+Option#114: quota : 
 0
-Option#108: noquota : 
+Option#116: noquota : 
 0
-Option#110: alloc_mode=reuse : 
+Option#118: alloc_mode=reuse : 
 0
-Option#112: alloc_mode=default : 
+Option#120: alloc_mode=default : 
 0
-Option#114: fsync_mode=posix : 
+Option#122: fsync_mode=posix : 
 0
-Option#116: fsync_mode=strict : 
+Option#124: fsync_mode=strict : 
 0
-Option#118: fsync_mode=nobarrier : 
+Option#126: fsync_mode=nobarrier : 
 0
-Option#120: test_dummy_encryption : 
+Option#128: test_dummy_encryption : 
 32
-Option#122: test_dummy_encryption=v1 : 
+Option#130: test_dummy_encryption=v1 : 
 32
-Option#124: test_dummy_encryption=v2 : 
+Option#132: test_dummy_encryption=v2 : 
 32
-Option#126: checkpoint=enable : 
+Option#134: checkpoint=enable : 
 0
-Option#128: checkpoint=disable : 
+Option#136: checkpoint=disable : 
 0
-Option#130: checkpoint=disable:32768 : 
+Option#138: checkpoint=disable:32768 : 
 0
-Option#132: checkpoint=disable:50% : 
+Option#140: checkpoint=disable:50% : 
 0
-Option#134: checkpoint_merge : 
+Option#142: checkpoint_merge : 
 0
-Option#136: nocheckpoint_merge : 
+Option#144: nocheckpoint_merge : 
 0
-Option#138: compress_algorithm=lzo : 
+Option#146: compress_algorithm=lzo : 
 0
-Option#140: inlinecrypt : 
+Option#148: inlinecrypt : 
 0
-Option#142: atgc : 
+Option#150: atgc : 
 0
-Option#144: discard_unit=block : 
+Option#152: discard_unit=block : 
 0
-Option#146: discard_unit=segment : 
+Option#154: discard_unit=segment : 
 0
-Option#148: discard_unit=section : 
+Option#156: discard_unit=section : 
 0
-Option#150: memory=normal : 
+Option#158: memory=normal : 
 0
-Option#152: memory=low : 
+Option#160: memory=low : 
 0
-Option#154: age_extent_cache : 
+Option#162: age_extent_cache : 
 0
-Option#156: errors=panic : 
+Option#164: errors=panic : 
 0
-Option#158: errors=continue : 
+Option#166: errors=continue : 
 0
-Option#160: errors=remount-ro : 
+Option#168: errors=remount-ro : 
 0
-Option#162: nat_bits : 
+Option#170: nat_bits : 
 0
-Option#164: atgc,mode=lfs : 
+Option#172: atgc,mode=lfs : 
 32
-Option#166: ro,flush_merge : 
+Option#174: ro,flush_merge : 
 32
-Option#168: rw : ro
+Option#176: rw : ro
 0
-Option#170: norecovery,ro : 
+Option#178: norecovery,ro : 
 0