All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>,
	Buildroot List <buildroot@buildroot.org>
Subject: Re: [Buildroot] [PATCH] support/testing/tests/fs/test_f2fs: fix test after f2fs-tools bump
Date: Tue, 16 Aug 2022 18:14:10 +0200	[thread overview]
Message-ID: <20220816161410.GP2775145@scaer> (raw)
In-Reply-To: <20220815204732.2220880-1-thomas.petazzoni@bootlin.com>

Thomas, All,

On 2022-08-15 22:47 +0200, Thomas Petazzoni via buildroot spake thusly:
> In commit
> 9267b0f14d3d5f4715bad444f44eae47d9d5627c ("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.

OK, sneaky, sneaky, and I missed fixing the 'not' in that last
sentence...

Applied to master, thanks.

Regards,
Yann E. MORIN.

> 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>
> ---
>  support/testing/tests/fs/test_f2fs.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/support/testing/tests/fs/test_f2fs.py b/support/testing/tests/fs/test_f2fs.py
> index 2d05a86418..425fbe31ca 100644
> --- a/support/testing/tests/fs/test_f2fs.py
> +++ b/support/testing/tests/fs/test_f2fs.py
> @@ -30,7 +30,7 @@ class TestF2FS(infra.basetest.BRTest):
>          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 sectors")
> +        prop = dumpf2fs_getprop(out, "Info: total FS sectors")
>          self.assertEqual(prop, "262144 (128 MB)")
>  
>          kernel = os.path.join(self.builddir, "images", "zImage")
> -- 
> 2.37.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

      reply	other threads:[~2022-08-16 16:14 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-15 20:47 [Buildroot] [PATCH] support/testing/tests/fs/test_f2fs: fix test after f2fs-tools bump Thomas Petazzoni via buildroot
2022-08-16 16:14 ` Yann E. MORIN [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220816161410.GP2775145@scaer \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@buildroot.org \
    --cc=fontaine.fabrice@gmail.com \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.