mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-05-05 20:56:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

binman: test: Capture output from tests with warnings

Browse Source 
Tests are supposed to run silently and capture any output produced.

Fix testRemoveTemplate() so that the message about the missing openssl
is captured, along with the invalid-images message.

Fix testNxpImx9Image() as well, since it is expected that container.img
and bl31.bin are missing.

Signed-off-by: Simon Glass <simon.glass@canonical.com>
This commit is contained in:
Simon Glass 2026-03-06 11:12:29 -07:00
parent a27980786c
commit b16319c643
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/binman/ftest.py
View File

@ -7915,7 +7915,8 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
container_path = os.path.join(testdir, 'mx95b0-ahab-container.img')
with open(container_path, 'w') as f:
f.write(bytes([0x87]).decode('latin1') * 32768)
self._DoTestFile('350_nxp_imx95.dts', output_dir=testdir)
with terminal.capture():
self._DoTestFile('350_nxp_imx95.dts', output_dir=testdir)
def testFitSignSimple(self):
"""Test that image with FIT and signature nodes can be signed"""
@ -8307,8 +8308,11 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
"""Test whether template is removed"""
TestFunctional._MakeInputFile('my-blob.bin', b'blob')
TestFunctional._MakeInputFile('my-blob2.bin', b'other')
self._DoTestFile('346_remove_template.dts',
force_missing_bintools='openssl',)
with terminal.capture() as (_, stderr):
self._DoTestFile('346_remove_template.dts',
force_missing_bintools='openssl',)
err = stderr.getvalue()
self.assertRegex(err, "Image 'file2'.*missing bintools.*: openssl")
def testBootphPropagation(self):
"""Test that bootph-* properties are propagated correctly to supernodes"""