All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3/4] support/testing/tests: fix tests to use infra.img_round_power2()
Date: Mon, 21 Jun 2021 22:25:45 +0200	[thread overview]
Message-ID: <20210621202547.360391-3-thomas.petazzoni@bootlin.com> (raw)
In-Reply-To: <20210621202547.360391-1-thomas.petazzoni@bootlin.com>

All the tests that are using if=sd as a Qemu options are changed to
use infra.img_round_power2() instead of simply extending the size of
the image to the next MB boundary, which is not longer sufficient with
Qemu >= 5.1.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 support/testing/tests/core/test_file_capabilities.py | 2 +-
 support/testing/tests/fs/test_squashfs.py            | 2 +-
 support/testing/tests/init/base.py                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/support/testing/tests/core/test_file_capabilities.py b/support/testing/tests/core/test_file_capabilities.py
index b9ece18d7b..bd46f5138d 100644
--- a/support/testing/tests/core/test_file_capabilities.py
+++ b/support/testing/tests/core/test_file_capabilities.py
@@ -28,7 +28,7 @@ class TestFileCapabilities(infra.basetest.BRTest):
 
     def test_run(self):
         img = os.path.join(self.builddir, "images", "rootfs.squashfs")
-        subprocess.call(["truncate", "-s", "%1M", img])
+        infra.img_round_power2(img)
 
         self.emulator.boot(arch="armv7",
                            kernel=os.path.join(self.builddir, "images", "zImage"),
diff --git a/support/testing/tests/fs/test_squashfs.py b/support/testing/tests/fs/test_squashfs.py
index 234f4944be..7d6297ec5e 100644
--- a/support/testing/tests/fs/test_squashfs.py
+++ b/support/testing/tests/fs/test_squashfs.py
@@ -22,7 +22,7 @@ class TestSquashfs(infra.basetest.BRTest):
         self.assertEqual(out[3], "Compression lz4")
 
         img = os.path.join(self.builddir, "images", "rootfs.squashfs")
-        subprocess.call(["truncate", "-s", "%1M", img])
+        infra.img_round_power2(img)
 
         self.emulator.boot(arch="armv7",
                            kernel="builtin",
diff --git a/support/testing/tests/init/base.py b/support/testing/tests/init/base.py
index 75cfbe9c59..7ed035263b 100644
--- a/support/testing/tests/init/base.py
+++ b/support/testing/tests/init/base.py
@@ -7,7 +7,7 @@ class InitSystemBase(infra.basetest.BRTest):
 
     def start_emulator(self, fs_type, kernel=None, dtb=None, init=None):
         img = os.path.join(self.builddir, "images", "rootfs.{}".format(fs_type))
-        subprocess.call(["truncate", "-s", "%1M", img])
+        infra.img_round_power2(img)
 
         options = ["-drive",
                    "file={},if=sd,format=raw".format(img),
-- 
2.31.1

  parent reply	other threads:[~2021-06-21 20:25 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-21 20:25 [Buildroot] [PATCH 1/4] support/testing/tests/fs/test_ext: specify 16 MB as ext filesystem size Thomas Petazzoni
2021-06-21 20:25 ` [Buildroot] [PATCH 2/4] support/testing/infra: add img_round_power2() function Thomas Petazzoni
2021-06-26 20:25   ` Yann E. MORIN
2021-06-21 20:25 ` Thomas Petazzoni [this message]
2021-06-26 20:27   ` [Buildroot] [PATCH 3/4] support/testing/tests: fix tests to use infra.img_round_power2() Yann E. MORIN
2021-06-21 20:25 ` [Buildroot] [PATCH 4/4] support/testing/tests/fs/test_ext: add missing "format" option for Qemu Thomas Petazzoni
2021-06-26 20:27   ` Yann E. MORIN
2021-06-26 20:23 ` [Buildroot] [PATCH 1/4] support/testing/tests/fs/test_ext: specify 16 MB as ext filesystem size Yann E. MORIN

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=20210621202547.360391-3-thomas.petazzoni@bootlin.com \
    --to=thomas.petazzoni@bootlin.com \
    --cc=buildroot@busybox.net \
    /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.