aboutsummaryrefslogtreecommitdiff
path: root/tools/binman
diff options
context:
space:
mode:
authorSimon Glass2022-01-12 13:10:35 -0700
committerTom Rini2022-01-12 21:26:59 -0500
commit32d4f106bd806428d756398a83d2b15563b58cf8 (patch)
tree7ac1ef348130e3907b366505352a9bdbe030f72d /tools/binman
parent9d358a8c26df56c01f3afd99c2f01b0cf03d35f6 (diff)
binman: Renumber the fake blob dts
Use a unique number instead of the current 203, which is used by 203_fip as well. Reformat the code to avoid a long line. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/binman')
-rw-r--r--tools/binman/ftest.py22
-rw-r--r--tools/binman/test/217_fake_blob.dts (renamed from tools/binman/test/203_fake_blob.dts)0
2 files changed, 12 insertions, 10 deletions
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index a9b7880f362..a9d9160967c 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -4667,16 +4667,6 @@ class TestFunctional(unittest.TestCase):
str(e.exception),
"Not enough space in '.*u_boot_binman_embed_sm' for data length.*")
- def testFakeBlob(self):
- """Test handling of faking an external blob"""
- with test_util.capture_sys_output() as (stdout, stderr):
- self._DoTestFile('203_fake_blob.dts', allow_missing=True,
- allow_fake_blobs=True)
- err = stderr.getvalue()
- self.assertRegex(err,
- "Image '.*' has faked external blobs and is non-functional: .*")
- os.remove('binman_faking_test_blob')
-
def testVersion(self):
"""Test we can get the binman version"""
version = '(unreleased)'
@@ -4965,5 +4955,17 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
# There should be a U-Boot after the final FIP
self.assertEqual(U_BOOT_DATA, data[-4:])
+ def testFakeBlob(self):
+ """Test handling of faking an external blob"""
+ with test_util.capture_sys_output() as (stdout, stderr):
+ self._DoTestFile('217_fake_blob.dts', allow_missing=True,
+ allow_fake_blobs=True)
+ err = stderr.getvalue()
+ self.assertRegex(
+ err,
+ "Image '.*' has faked external blobs and is non-functional: .*")
+ os.remove('binman_faking_test_blob')
+
+
if __name__ == "__main__":
unittest.main()
diff --git a/tools/binman/test/203_fake_blob.dts b/tools/binman/test/217_fake_blob.dts
index 22cf67f4f83..22cf67f4f83 100644
--- a/tools/binman/test/203_fake_blob.dts
+++ b/tools/binman/test/217_fake_blob.dts