tests: support mkfs.ext4 without metadata_csum
PATCH 1/1 tests: support mkfs.ext4 without metadata_csum
From: Stephen Warren <[email protected]>
Modify various test/py filesystem creation routines to support systems that don't implement the metadata_csum ext4 feature.
Signed-off-by Stephen Warren <[email protected]>
--- test/py/tests/test_env.py | 5 ++++- test/py/tests/test_fs/conftest.py | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-)
test/py/tests/test_env.py +4 -1
@@ -416,7 +416,10 @@ def mk_env_ext4(state_test_env): else: try: u_boot_utils.run_and_log(c, 'dd if=/dev/zero of=%s bs=1M count=16' % persistent) - u_boot_utils.run_and_log(c, 'mkfs.ext4 -O ^metadata_csum %s' % persistent) + u_boot_utils.run_and_log(c, 'mkfs.ext4 %s' % persistent) + sb_content = u_boot_utils.run_and_log(c, 'tune2fs -l %s' % persistent) + if 'metadata_csum' in sb_content: + u_boot_utils.run_and_log(c, 'tune2fs -O ^metadata_csum %s' % persistent) except CalledProcessError: call('rm -f %s' % persistent, shell=True) raise
test/py/tests/test_fs/conftest.py +4 -2
@@ -149,8 +149,6 @@ def mk_fs(config, fs_type, size, id): mkfs_opt = '-F 16' elif fs_type == 'fat32': mkfs_opt = '-F 32' - elif fs_type == 'ext4': - mkfs_opt = '-O ^metadata_csum' else: mkfs_opt = ''
@@ -167,6 +165,10 @@ def mk_fs(config, fs_type, size, id): % (fs_img, count), shell=True) check_call('mkfs.%s %s %s' % (fs_lnxtype, mkfs_opt, fs_img), shell=True) + if fs_type == 'ext4': + sb_content = check_output('tune2fs -l %s' % fs_img, shell=True).decode() + if 'metadata_csum' in sb_content: + check_call('tune2fs -O ^metadata_csum %s' % fs_img, shell=True) return fs_img except CalledProcessError: call('rm -f %s' % fs_img, shell=True)
Signature · 1 line
2.27.0
PATCH 1/1 tests: support mkfs.ext4 without metadata_csum
Quoted 6 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Modify various test/py filesystem creation routines to support systems that don't implement the
metadata_csumext4 feature.Signed-off-by Stephen Warren <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200808/d7c3b513/attachment.sig>