0214ee94e0
In commit
9267b0f14d ("package/f2fs-tools: bump to
version 1.15.0"), f2fs-tools was bumped from 1.14.0 to 1.15.0.
It turns out that this version bump causes the output of dump.f2fs to
slightly change.
In version 1.14.0, it looked like this:
Info: Segments per section = 1
Info: Sections per zone = 1
Info: sector size = 512
Info: total sectors = 262144 (128 MB)
Info: MKFS version
"Linux version 5.4.0-124-generic (buildd@lcy02-amd64-089) (gcc version 9.4.0 (Ubuntu 9.4.0-1ubuntu1~20.04.1)) #140-Ubuntu SMP Thu Aug 4 02:23:37 UTC 2022"
Info: FSCK version
from "Linux version 5.4.0-124-generic (buildd@lcy02-amd64-089) (gcc version 9.4.0 (Ubuntu 9.4.0-1ubuntu1~20.04.1)) #140-Ubuntu SMP Thu Aug 4 02:23:37 UTC 20
22"
to "Linux version 5.4.0-124-generic (buildd@lcy02-amd64-089) (gcc version 9.4.0 (Ubuntu 9.4.0-1ubuntu1~20.04.1)) #140-Ubuntu SMP Thu Aug 4 02:23:37 UTC 20
22"
Info: superblock features = 0 :
Info: superblock encrypt level = 0, salt = 00000000000000000000000000000000
Info: total FS sectors = 262144 (128 MB)
Info: CKPT version = 70c101c3
Info: checkpoint state = 181 : trimmed nat_bits unmount
In version 1.15.0, it looked like this:
Info: MKFS version
"Linux version 5.4.0-124-generic (buildd@lcy02-amd64-089) (gcc version 9.4.0 (Ubuntu 9.4.0-1ubuntu1~20.04.1)) #140-Ubuntu SMP Thu Aug 4 02:23:37 UTC 2022"
Info: FSCK version
from "Linux version 5.4.0-124-generic (buildd@lcy02-amd64-089) (gcc version 9.4.0 (Ubuntu 9.4.0-1ubuntu1~20.04.1)) #140-Ubuntu SMP Thu Aug 4 02:23:37 UTC 20
22"
to "Linux version 5.4.0-124-generic (buildd@lcy02-amd64-089) (gcc version 9.4.0 (Ubuntu 9.4.0-1ubuntu1~20.04.1)) #140-Ubuntu SMP Thu Aug 4 02:23:37 UTC 20
22"
Info: superblock features = 0 :
Info: superblock encrypt level = 0, salt = 00000000000000000000000000000000
Info: Segments per section = 1
Info: Sections per zone = 1
Info: total FS sectors = 262144 (128 MB)
Info: CKPT version = b89f8bb
Info: checkpoint state = 181 : trimmed nat_bits unmount
You will notice that the message "Info: total sectors = 262144 (128
MB)" is no longer present, and only "Info: total FS sectors =
262144 (128 MB)" is not present.
Except our test case was precisely looking for this "Info: total
sectors" string in the output, causing the test to fail.
We fix this by simply matching on "Info: total FS sectors" now.
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/2884634814
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
48 lines
1.8 KiB
Python
48 lines
1.8 KiB
Python
import os
|
|
|
|
import infra.basetest
|
|
|
|
|
|
def dumpf2fs_getprop(out, prop):
|
|
for line in out:
|
|
fields = line.split(" = ")
|
|
if fields[0] == prop:
|
|
return fields[1].strip()
|
|
|
|
|
|
class TestF2FS(infra.basetest.BRTest):
|
|
config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
|
|
"""
|
|
BR2_TARGET_ROOTFS_F2FS=y
|
|
BR2_TARGET_ROOTFS_F2FS_SIZE="128M"
|
|
BR2_TARGET_ROOTFS_F2FS_OVERPROVISION=0
|
|
BR2_TARGET_ROOTFS_F2FS_DISCARD=y
|
|
# BR2_TARGET_ROOTFS_TAR is not set
|
|
BR2_LINUX_KERNEL=y
|
|
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
|
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204"
|
|
BR2_LINUX_KERNEL_USE_DEFCONFIG=y
|
|
BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
|
|
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}"
|
|
""".format(infra.filepath("conf/f2fs-kernel-fragment.config"))
|
|
|
|
def test_run(self):
|
|
img = os.path.join(self.builddir, "images", "rootfs.f2fs")
|
|
out = infra.run_cmd_on_host(self.builddir, ["host/sbin/dump.f2fs", img])
|
|
out = out.splitlines()
|
|
prop = dumpf2fs_getprop(out, "Info: total FS sectors")
|
|
self.assertEqual(prop, "262144 (128 MB)")
|
|
|
|
kernel = os.path.join(self.builddir, "images", "zImage")
|
|
kernel_cmdline = ["root=/dev/mmcblk0", "rootfstype=f2fs",
|
|
"console=ttyAMA0"]
|
|
dtb = infra.download(self.downloaddir, "vexpress-v2p-ca9.dtb")
|
|
options = ["-M", "vexpress-a9", "-dtb", dtb,
|
|
"-drive", "file={},if=sd,format=raw".format(img)]
|
|
self.emulator.boot(arch="armv7", kernel=kernel,
|
|
kernel_cmdline=kernel_cmdline,
|
|
options=options)
|
|
self.emulator.login()
|
|
cmd = "mount | grep '/dev/root on / type f2fs'"
|
|
self.assertRunOk(cmd)
|