support/testing/tests: fix tests to use infra.img_round_power2()

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>
[yann.morin.1998@free.fr: drop now-useless imports]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Thomas Petazzoni 2021-06-21 22:25:45 +02:00 committed by Yann E. MORIN
parent 37a1af7a74
commit abe32cfdf0
3 changed files with 3 additions and 6 deletions

View File

@ -1,5 +1,4 @@
import os
import subprocess
import infra.basetest
@ -28,7 +27,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"),

View File

@ -1,5 +1,4 @@
import os
import subprocess
import infra.basetest
@ -22,7 +21,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",

View File

@ -1,5 +1,4 @@
import os
import subprocess
import infra.basetest
@ -7,7 +6,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),