diff options
| author | Stephen Warren <swarren@nvidia.com> | 2020-08-04 11:28:33 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-07 22:31:32 -0400 |
| commit | cc886253704424f2a332dade72dc1853e78bca04 (patch) | |
| tree | bf202530d38957fae4b49454812b1368e75c5afc | |
| parent | edca8edd79583e6dd04d8d07767288c4fc0948b9 (diff) | |
| download | u-boot-cc886253704424f2a332dade72dc1853e78bca04.tar.gz u-boot-cc886253704424f2a332dade72dc1853e78bca04.tar.bz2 u-boot-cc886253704424f2a332dade72dc1853e78bca04.zip | |
tests: support mkfs.ext4 without metadata_csum
Modify various test/py filesystem creation routines to support systems
that don't implement the metadata_csum ext4 feature.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
| -rw-r--r-- | test/py/tests/test_env.py | 5 | ||||
| -rw-r--r-- | test/py/tests/test_fs/conftest.py | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py index 86ec1b36d3..2ae8f25381 100644 --- a/test/py/tests/test_env.py +++ b/test/py/tests/test_env.py @@ -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 diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs/conftest.py index ee82169c2a..58e8cd46ee 100644 --- a/test/py/tests/test_fs/conftest.py +++ b/test/py/tests/test_fs/conftest.py @@ -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) |