[RFC PATCH 10/16] binman: test: Move mkimage test files to test/mkimage/
Simon Glass
sjg at chromium.org
Fri Feb 27 00:47:50 CET 2026
From: Simon Glass <simon.glass at canonical.com>
Move about a dozen test files for mkimage entries into a mkimage/
subdirectory. Drop the numeric prefixes and the redundant mkimage_
filename prefix, and update all references.
Signed-off-by: Simon Glass <simon.glass at canonical.com>
---
tools/binman/ftest.py | 32 +++++++++----------
.../coll.dts} | 0
.../filename.dts} | 0
.../image.dts} | 0
.../image_bad.dts} | 0
.../image_no_content.dts} | 0
.../missing.dts} | 0
.../missing_multiple.dts} | 0
.../{156_mkimage.dts => mkimage/mkimage.dts} | 0
.../mult_data.dts} | 0
.../mult_no_content.dts} | 0
.../name.dts} | 0
.../special.dts} | 0
.../{290_mkimage_sym.dts => mkimage/sym.dts} | 0
14 files changed, 16 insertions(+), 16 deletions(-)
rename tools/binman/test/{247_mkimage_coll.dts => mkimage/coll.dts} (100%)
rename tools/binman/test/{254_mkimage_filename.dts => mkimage/filename.dts} (100%)
rename tools/binman/test/{243_mkimage_image.dts => mkimage/image.dts} (100%)
rename tools/binman/test/{245_mkimage_image_bad.dts => mkimage/image_bad.dts} (100%)
rename tools/binman/test/{244_mkimage_image_no_content.dts => mkimage/image_no_content.dts} (100%)
rename tools/binman/test/{229_mkimage_missing.dts => mkimage/missing.dts} (100%)
rename tools/binman/test/{292_mkimage_missing_multiple.dts => mkimage/missing_multiple.dts} (100%)
rename tools/binman/test/{156_mkimage.dts => mkimage/mkimage.dts} (100%)
rename tools/binman/test/{252_mkimage_mult_data.dts => mkimage/mult_data.dts} (100%)
rename tools/binman/test/{253_mkimage_mult_no_content.dts => mkimage/mult_no_content.dts} (100%)
rename tools/binman/test/{242_mkimage_name.dts => mkimage/name.dts} (100%)
rename tools/binman/test/{283_mkimage_special.dts => mkimage/special.dts} (100%)
rename tools/binman/test/{290_mkimage_sym.dts => mkimage/sym.dts} (100%)
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index c2cea9e6618..8f5dcc2878c 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -3868,7 +3868,7 @@ class TestFunctional(unittest.TestCase):
def testMkimage(self):
"""Test using mkimage to build an image"""
self._SetupSplElf()
- data = self._DoReadFile('156_mkimage.dts')
+ data = self._DoReadFile('mkimage/mkimage.dts')
# Just check that the data appears in the file somewhere
self.assertIn(U_BOOT_SPL_DATA, data)
@@ -3877,7 +3877,7 @@ class TestFunctional(unittest.TestCase):
"""Test that binman still produces an image if mkimage is missing"""
self._SetupSplElf()
with terminal.capture() as (_, stderr):
- self._DoTestFile('156_mkimage.dts',
+ self._DoTestFile('mkimage/mkimage.dts',
force_missing_bintools='mkimage')
err = stderr.getvalue()
self.assertRegex(err, "Image 'image'.*missing bintools.*: mkimage")
@@ -5809,7 +5809,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
def testMkimageMissingBlob(self):
"""Test using mkimage to build an image"""
with terminal.capture() as (stdout, stderr):
- self._DoTestFile('229_mkimage_missing.dts', allow_missing=True,
+ self._DoTestFile('mkimage/missing.dts', allow_missing=True,
allow_fake_blobs=True)
err = stderr.getvalue()
self.assertRegex(
@@ -6118,7 +6118,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
def testMkimageImagename(self):
"""Test using mkimage with -n holding the data too"""
self._SetupSplElf()
- data = self._DoReadFile('242_mkimage_name.dts')
+ data = self._DoReadFile('mkimage/name.dts')
# Check that the data appears in the file somewhere
self.assertIn(U_BOOT_SPL_DATA, data)
@@ -6136,7 +6136,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
def testMkimageImage(self):
"""Test using mkimage with -n holding the data too"""
self._SetupSplElf()
- data = self._DoReadFile('243_mkimage_image.dts')
+ data = self._DoReadFile('mkimage/image.dts')
# Check that the data appears in the file somewhere
self.assertIn(U_BOOT_SPL_DATA, data)
@@ -6158,7 +6158,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
"""Test using mkimage with -n and no data"""
self._SetupSplElf()
with self.assertRaises(ValueError) as exc:
- self._DoReadFile('244_mkimage_image_no_content.dts')
+ self._DoReadFile('mkimage/image_no_content.dts')
self.assertIn('Could not complete processing of contents',
str(exc.exception))
@@ -6166,7 +6166,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
"""Test using mkimage with imagename node and data-to-imagename"""
self._SetupSplElf()
with self.assertRaises(ValueError) as exc:
- self._DoReadFile('245_mkimage_image_bad.dts')
+ self._DoReadFile('mkimage/image_bad.dts')
self.assertIn('Cannot use both imagename node and data-to-imagename',
str(exc.exception))
@@ -6181,7 +6181,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
def testMkimageCollection(self):
"""Test using a collection referring to an entry in a mkimage entry"""
self._SetupSplElf()
- data = self._DoReadFile('247_mkimage_coll.dts')
+ data = self._DoReadFile('mkimage/coll.dts')
expect = U_BOOT_SPL_DATA + U_BOOT_DATA
self.assertEqual(expect, data[:len(expect)])
@@ -6269,7 +6269,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
"""Test passing multiple files to mkimage in a mkimage entry"""
self._SetupSplElf()
self._SetupTplElf()
- data = self._DoReadFile('252_mkimage_mult_data.dts')
+ data = self._DoReadFile('mkimage/mult_data.dts')
# Size of files are packed in their 4B big-endian format
expect = struct.pack('>I', len(U_BOOT_TPL_DATA))
expect += struct.pack('>I', len(U_BOOT_SPL_DATA))
@@ -6291,7 +6291,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
'spl-bss-pad': 'y',
'spl-dtb': 'y',
}
- data = self._DoReadFileDtb('252_mkimage_mult_data.dts',
+ data = self._DoReadFileDtb('mkimage/mult_data.dts',
use_expanded=True, entry_args=entry_args)[0]
pad_len = 10
tpl_expect = U_BOOT_TPL_DATA
@@ -6320,14 +6320,14 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
"""Test passing multiple data files to mkimage with one data file having no content"""
self._SetupSplElf()
with self.assertRaises(ValueError) as exc:
- self._DoReadFile('253_mkimage_mult_no_content.dts')
+ self._DoReadFile('mkimage/mult_no_content.dts')
self.assertIn('Could not complete processing of contents',
str(exc.exception))
def testMkimageFilename(self):
"""Test using mkimage to build a binary with a filename"""
self._SetupSplElf()
- retcode = self._DoTestFile('254_mkimage_filename.dts')
+ retcode = self._DoTestFile('mkimage/filename.dts')
self.assertEqual(0, retcode)
fname = tools.get_output_filename('mkimage-test.bin')
self.assertTrue(os.path.exists(fname))
@@ -6891,12 +6891,12 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
def testMkimageMissingBlobMultiple(self):
"""Test missing blob with mkimage entry and multiple-data-files"""
with terminal.capture() as (stdout, stderr):
- self._DoTestFile('292_mkimage_missing_multiple.dts', allow_missing=True)
+ self._DoTestFile('mkimage/missing_multiple.dts', allow_missing=True)
err = stderr.getvalue()
self.assertIn("is missing external blobs and is non-functional", err)
with self.assertRaises(ValueError) as e:
- self._DoTestFile('292_mkimage_missing_multiple.dts', allow_missing=False)
+ self._DoTestFile('mkimage/missing_multiple.dts', allow_missing=False)
self.assertIn("not found in input path", str(e.exception))
def _PrepareSignEnv(self, dts='fit/sign.dts'):
@@ -7002,7 +7002,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
def testMkimageSpecial(self):
"""Test mkimage ignores special hash-1 node"""
- data = self._DoReadFile('283_mkimage_special.dts')
+ data = self._DoReadFile('mkimage/special.dts')
# Just check that the data appears in the file somewhere
self.assertIn(U_BOOT_DATA, data)
@@ -7085,7 +7085,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
def testMkimageSymbols(self):
"""Test using mkimage to build an image with symbols in it"""
self._SetupSplElf('u_boot_binman_syms')
- data = self._DoReadFile('290_mkimage_sym.dts')
+ data = self._DoReadFile('mkimage/sym.dts')
image = control.images['image']
entries = image.GetEntries()
diff --git a/tools/binman/test/247_mkimage_coll.dts b/tools/binman/test/mkimage/coll.dts
similarity index 100%
rename from tools/binman/test/247_mkimage_coll.dts
rename to tools/binman/test/mkimage/coll.dts
diff --git a/tools/binman/test/254_mkimage_filename.dts b/tools/binman/test/mkimage/filename.dts
similarity index 100%
rename from tools/binman/test/254_mkimage_filename.dts
rename to tools/binman/test/mkimage/filename.dts
diff --git a/tools/binman/test/243_mkimage_image.dts b/tools/binman/test/mkimage/image.dts
similarity index 100%
rename from tools/binman/test/243_mkimage_image.dts
rename to tools/binman/test/mkimage/image.dts
diff --git a/tools/binman/test/245_mkimage_image_bad.dts b/tools/binman/test/mkimage/image_bad.dts
similarity index 100%
rename from tools/binman/test/245_mkimage_image_bad.dts
rename to tools/binman/test/mkimage/image_bad.dts
diff --git a/tools/binman/test/244_mkimage_image_no_content.dts b/tools/binman/test/mkimage/image_no_content.dts
similarity index 100%
rename from tools/binman/test/244_mkimage_image_no_content.dts
rename to tools/binman/test/mkimage/image_no_content.dts
diff --git a/tools/binman/test/229_mkimage_missing.dts b/tools/binman/test/mkimage/missing.dts
similarity index 100%
rename from tools/binman/test/229_mkimage_missing.dts
rename to tools/binman/test/mkimage/missing.dts
diff --git a/tools/binman/test/292_mkimage_missing_multiple.dts b/tools/binman/test/mkimage/missing_multiple.dts
similarity index 100%
rename from tools/binman/test/292_mkimage_missing_multiple.dts
rename to tools/binman/test/mkimage/missing_multiple.dts
diff --git a/tools/binman/test/156_mkimage.dts b/tools/binman/test/mkimage/mkimage.dts
similarity index 100%
rename from tools/binman/test/156_mkimage.dts
rename to tools/binman/test/mkimage/mkimage.dts
diff --git a/tools/binman/test/252_mkimage_mult_data.dts b/tools/binman/test/mkimage/mult_data.dts
similarity index 100%
rename from tools/binman/test/252_mkimage_mult_data.dts
rename to tools/binman/test/mkimage/mult_data.dts
diff --git a/tools/binman/test/253_mkimage_mult_no_content.dts b/tools/binman/test/mkimage/mult_no_content.dts
similarity index 100%
rename from tools/binman/test/253_mkimage_mult_no_content.dts
rename to tools/binman/test/mkimage/mult_no_content.dts
diff --git a/tools/binman/test/242_mkimage_name.dts b/tools/binman/test/mkimage/name.dts
similarity index 100%
rename from tools/binman/test/242_mkimage_name.dts
rename to tools/binman/test/mkimage/name.dts
diff --git a/tools/binman/test/283_mkimage_special.dts b/tools/binman/test/mkimage/special.dts
similarity index 100%
rename from tools/binman/test/283_mkimage_special.dts
rename to tools/binman/test/mkimage/special.dts
diff --git a/tools/binman/test/290_mkimage_sym.dts b/tools/binman/test/mkimage/sym.dts
similarity index 100%
rename from tools/binman/test/290_mkimage_sym.dts
rename to tools/binman/test/mkimage/sym.dts
--
2.43.0
More information about the U-Boot
mailing list