[PATCH 05/11] test: Move Android image-creation to its own file
Simon Glass
sjg at chromium.org
Mon May 18 00:51:03 CEST 2026
Move setup_android_image() function to its own module.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
test/py/img/android.py | 138 +++++++++++++++++++++++++++++++++++++++
test/py/tests/test_ut.py | 128 +-----------------------------------
2 files changed, 139 insertions(+), 127 deletions(-)
create mode 100644 test/py/img/android.py
diff --git a/test/py/img/android.py b/test/py/img/android.py
new file mode 100644
index 00000000000..2ea964f5520
--- /dev/null
+++ b/test/py/img/android.py
@@ -0,0 +1,138 @@
+# SPDX-License-Identifier: GPL-2.0+
+# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
+
+"""Create Android test disk images"""
+
+import collections
+import os
+
+import utils
+from test_android import test_abootimg
+
+
+def setup_android_image(ubman):
+ """Create a 20MB disk image with Android partitions"""
+ Partition = collections.namedtuple('part', 'start,size,name')
+ parts = {}
+ disk_data = None
+
+ def set_part_data(partnum, data):
+ """Set the contents of a disk partition
+
+ This updates disk_data by putting data in the right place
+
+ Args:
+ partnum (int): Partition number to set
+ data (bytes): Data for that partition
+ """
+ nonlocal disk_data
+
+ start = parts[partnum].start * sect_size
+ disk_data = disk_data[:start] + data + disk_data[start + len(data):]
+
+ mmc_dev = 7
+ fname = os.path.join(ubman.config.source_dir, f'mmc{mmc_dev}.img')
+ utils.run_and_log(ubman, f'qemu-img create {fname} 20M')
+ utils.run_and_log(ubman, f'cgpt create {fname}')
+
+ ptr = 40
+
+ # Number of sectors in 1MB
+ sect_size = 512
+ sect_1mb = (1 << 20) // sect_size
+
+ required_parts = [
+ {'num': 1, 'label':'misc', 'size': '1M'},
+ {'num': 2, 'label':'boot_a', 'size': '4M'},
+ {'num': 3, 'label':'boot_b', 'size': '4M'},
+ {'num': 4, 'label':'vendor_boot_a', 'size': '4M'},
+ {'num': 5, 'label':'vendor_boot_b', 'size': '4M'},
+ ]
+
+ for part in required_parts:
+ size_str = part['size']
+ if 'M' in size_str:
+ size = int(size_str[:-1]) * sect_1mb
+ else:
+ size = int(size_str)
+ utils.run_and_log(
+ ubman,
+ f"cgpt add -i {part['num']} -b {ptr} -s {size} -l {part['label']} -t basicdata {fname}")
+ ptr += size
+
+ utils.run_and_log(ubman, f'cgpt boot -p {fname}')
+ out = utils.run_and_log(ubman, f'cgpt show -q {fname}')
+
+ # Create a dict (indexed by partition number) containing the above info
+ for line in out.splitlines():
+ start, size, num, name = line.split(maxsplit=3)
+ parts[int(num)] = Partition(int(start), int(size), name)
+
+ with open(fname, 'rb') as inf:
+ disk_data = inf.read()
+
+ test_abootimg.AbootimgTestDiskImage(ubman, 'bootv4.img', test_abootimg.boot_img_hex)
+ boot_img = os.path.join(ubman.config.result_dir, 'bootv4.img')
+ with open(boot_img, 'rb') as inf:
+ set_part_data(2, inf.read())
+
+ test_abootimg.AbootimgTestDiskImage(ubman, 'vendor_boot.img', test_abootimg.vboot_img_hex)
+ vendor_boot_img = os.path.join(ubman.config.result_dir, 'vendor_boot.img')
+ with open(vendor_boot_img, 'rb') as inf:
+ set_part_data(4, inf.read())
+
+ with open(fname, 'wb') as outf:
+ outf.write(disk_data)
+
+ print(f'wrote to {fname}')
+
+ mmc_dev = 8
+ fname = os.path.join(ubman.config.source_dir, f'mmc{mmc_dev}.img')
+ utils.run_and_log(ubman, f'qemu-img create {fname} 20M')
+ utils.run_and_log(ubman, f'cgpt create {fname}')
+
+ ptr = 40
+
+ # Number of sectors in 1MB
+ sect_size = 512
+ sect_1mb = (1 << 20) // sect_size
+
+ required_parts = [
+ {'num': 1, 'label':'misc', 'size': '1M'},
+ {'num': 2, 'label':'boot_a', 'size': '4M'},
+ {'num': 3, 'label':'boot_b', 'size': '4M'},
+ ]
+
+ for part in required_parts:
+ size_str = part['size']
+ if 'M' in size_str:
+ size = int(size_str[:-1]) * sect_1mb
+ else:
+ size = int(size_str)
+ utils.run_and_log(
+ ubman,
+ f"cgpt add -i {part['num']} -b {ptr} -s {size} -l {part['label']} -t basicdata {fname}")
+ ptr += size
+
+ utils.run_and_log(ubman, f'cgpt boot -p {fname}')
+ out = utils.run_and_log(ubman, f'cgpt show -q {fname}')
+
+ # Create a dict (indexed by partition number) containing the above info
+ for line in out.splitlines():
+ start, size, num, name = line.split(maxsplit=3)
+ parts[int(num)] = Partition(int(start), int(size), name)
+
+ with open(fname, 'rb') as inf:
+ disk_data = inf.read()
+
+ test_abootimg.AbootimgTestDiskImage(ubman, 'boot.img', test_abootimg.img_hex)
+ boot_img = os.path.join(ubman.config.result_dir, 'boot.img')
+ with open(boot_img, 'rb') as inf:
+ set_part_data(2, inf.read())
+
+ with open(fname, 'wb') as outf:
+ outf.write(disk_data)
+
+ print(f'wrote to {fname}')
+
+ return fname
diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py
index 5630c3dbe8a..9e571304dee 100644
--- a/test/py/tests/test_ut.py
+++ b/test/py/tests/test_ut.py
@@ -23,135 +23,9 @@ from img.common import mkdir_cond, copy_partition, setup_extlinux_image
from img.fedora import setup_fedora_image
from img.armbian import setup_bootmenu_image
from img.chromeos import setup_cros_image
+from img.android import setup_android_image
-def setup_android_image(ubman):
- """Create a 20MB disk image with Android partitions"""
- Partition = collections.namedtuple('part', 'start,size,name')
- parts = {}
- disk_data = None
-
- def set_part_data(partnum, data):
- """Set the contents of a disk partition
-
- This updates disk_data by putting data in the right place
-
- Args:
- partnum (int): Partition number to set
- data (bytes): Data for that partition
- """
- nonlocal disk_data
-
- start = parts[partnum].start * sect_size
- disk_data = disk_data[:start] + data + disk_data[start + len(data):]
-
- mmc_dev = 7
- fname = os.path.join(ubman.config.source_dir, f'mmc{mmc_dev}.img')
- utils.run_and_log(ubman, f'qemu-img create {fname} 20M')
- utils.run_and_log(ubman, f'cgpt create {fname}')
-
- ptr = 40
-
- # Number of sectors in 1MB
- sect_size = 512
- sect_1mb = (1 << 20) // sect_size
-
- required_parts = [
- {'num': 1, 'label':'misc', 'size': '1M'},
- {'num': 2, 'label':'boot_a', 'size': '4M'},
- {'num': 3, 'label':'boot_b', 'size': '4M'},
- {'num': 4, 'label':'vendor_boot_a', 'size': '4M'},
- {'num': 5, 'label':'vendor_boot_b', 'size': '4M'},
- ]
-
- for part in required_parts:
- size_str = part['size']
- if 'M' in size_str:
- size = int(size_str[:-1]) * sect_1mb
- else:
- size = int(size_str)
- utils.run_and_log(
- ubman,
- f"cgpt add -i {part['num']} -b {ptr} -s {size} -l {part['label']} -t basicdata {fname}")
- ptr += size
-
- utils.run_and_log(ubman, f'cgpt boot -p {fname}')
- out = utils.run_and_log(ubman, f'cgpt show -q {fname}')
-
- # Create a dict (indexed by partition number) containing the above info
- for line in out.splitlines():
- start, size, num, name = line.split(maxsplit=3)
- parts[int(num)] = Partition(int(start), int(size), name)
-
- with open(fname, 'rb') as inf:
- disk_data = inf.read()
-
- test_abootimg.AbootimgTestDiskImage(ubman, 'bootv4.img', test_abootimg.boot_img_hex)
- boot_img = os.path.join(ubman.config.result_dir, 'bootv4.img')
- with open(boot_img, 'rb') as inf:
- set_part_data(2, inf.read())
-
- test_abootimg.AbootimgTestDiskImage(ubman, 'vendor_boot.img', test_abootimg.vboot_img_hex)
- vendor_boot_img = os.path.join(ubman.config.result_dir, 'vendor_boot.img')
- with open(vendor_boot_img, 'rb') as inf:
- set_part_data(4, inf.read())
-
- with open(fname, 'wb') as outf:
- outf.write(disk_data)
-
- print(f'wrote to {fname}')
-
- mmc_dev = 8
- fname = os.path.join(ubman.config.source_dir, f'mmc{mmc_dev}.img')
- utils.run_and_log(ubman, f'qemu-img create {fname} 20M')
- utils.run_and_log(ubman, f'cgpt create {fname}')
-
- ptr = 40
-
- # Number of sectors in 1MB
- sect_size = 512
- sect_1mb = (1 << 20) // sect_size
-
- required_parts = [
- {'num': 1, 'label':'misc', 'size': '1M'},
- {'num': 2, 'label':'boot_a', 'size': '4M'},
- {'num': 3, 'label':'boot_b', 'size': '4M'},
- ]
-
- for part in required_parts:
- size_str = part['size']
- if 'M' in size_str:
- size = int(size_str[:-1]) * sect_1mb
- else:
- size = int(size_str)
- utils.run_and_log(
- ubman,
- f"cgpt add -i {part['num']} -b {ptr} -s {size} -l {part['label']} -t basicdata {fname}")
- ptr += size
-
- utils.run_and_log(ubman, f'cgpt boot -p {fname}')
- out = utils.run_and_log(ubman, f'cgpt show -q {fname}')
-
- # Create a dict (indexed by partition number) containing the above info
- for line in out.splitlines():
- start, size, num, name = line.split(maxsplit=3)
- parts[int(num)] = Partition(int(start), int(size), name)
-
- with open(fname, 'rb') as inf:
- disk_data = inf.read()
-
- test_abootimg.AbootimgTestDiskImage(ubman, 'boot.img', test_abootimg.img_hex)
- boot_img = os.path.join(ubman.config.result_dir, 'boot.img')
- with open(boot_img, 'rb') as inf:
- set_part_data(2, inf.read())
-
- with open(fname, 'wb') as outf:
- outf.write(disk_data)
-
- print(f'wrote to {fname}')
-
- return fname
-
def setup_cedit_file(ubman):
"""Set up a .dtb file for use with testing expo and configuration editor"""
infname = os.path.join(ubman.config.source_dir,
--
2.43.0
More information about the U-Boot
mailing list