From: Yannic Moog <y.moog@phytec.de>
To: Simon Glass <sjg@chromium.org>,
Alper Nebi Yasak <alpernebiyasak@gmail.com>,
Tom Rini <trini@konsulko.com>
Cc: Fabio Estevam <festevam@gmail.com>,
Tim Harvey <tharvey@gateworks.com>,
Benjamin Hahn <b.hahn@phytec.de>,
Teresa Remmet <t.remmet@phytec.de>,
Yashwanth Varakala <y.varakala@phytec.de>,
<upstream@lists.phytec.de>, <u-boot@lists.denx.de>,
Yannic Moog <y.moog@phytec.de>
Subject: [PATCH RFC 3/6] tools: binman: ftest: fix tests that require non-faked ext blobs
Date: Wed, 29 Jan 2025 11:29:48 +0100 [thread overview]
Message-ID: <20250129-binman_faked_optional-v1-3-a4534bc67cbb@phytec.de> (raw)
In-Reply-To: <20250129-binman_faked_optional-v1-0-a4534bc67cbb@phytec.de>
By default, external blobs are faked. Some tests care only about more
basic functionality. In those cases no external blobs should be faked.
That would trigger a different (binman) case which is not in scope for
those particular tests.
Thus, disable faked blobs for those test cases.
Signed-off-by: Yannic Moog <y.moog@phytec.de>
---
tools/binman/ftest.py | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 82f839e33b0..66d1cc240d0 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -5188,13 +5188,15 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
def testExtblobList(self):
"""Test an image with an external blob list"""
- data = self._DoReadFile('215_blob_ext_list.dts')
- self.assertEqual(REFCODE_DATA + FSP_M_DATA, data)
+ data = self._DoReadFileDtb('215_blob_ext_list.dts',
+ allow_fake_blobs=False)
+ self.assertEqual(REFCODE_DATA + FSP_M_DATA, data[0])
def testExtblobListMissing(self):
"""Test an image with a missing external blob"""
with self.assertRaises(ValueError) as e:
- self._DoReadFile('216_blob_ext_list_missing.dts')
+ self._DoReadFileDtb('216_blob_ext_list_missing.dts',
+ allow_fake_blobs=False)
self.assertIn("Filename 'missing-file' not found in input path",
str(e.exception))
@@ -5202,7 +5204,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
"""Test an image with an missing external blob that is allowed"""
with test_util.capture_sys_output() as (stdout, stderr):
self._DoTestFile('216_blob_ext_list_missing.dts',
- allow_missing=True)
+ allow_missing=True, allow_fake_blobs=False)
err = stderr.getvalue()
self.assertRegex(err, "Image 'image'.*missing.*: blob-ext")
@@ -5739,10 +5741,10 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
def testFitSplitElfMissing(self):
- """Test an split-elf FIT with a missing ELF file"""
+ """Test an split-elf FIT with a missing ELF file. Don't fake the file."""
if not elf.ELF_TOOLS:
self.skipTest('Python elftools not available')
- out, err = self.checkFitSplitElf(allow_missing=True)
+ out, err = self.checkFitSplitElf(allow_missing=True, allow_fake_blobs=False)
self.assertRegex(
err,
"Image '.*' is missing external blobs and is non-functional: .*")
@@ -6506,7 +6508,9 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
def testExtblobOptional(self):
"""Test an image with an external blob that is optional"""
with test_util.capture_sys_output() as (stdout, stderr):
- data = self._DoReadFile('266_blob_ext_opt.dts')
+ data = self._DoReadFileDtb('266_blob_ext_opt.dts',
+ allow_fake_blobs=False)[0]
+
self.assertEqual(REFCODE_DATA, data)
err = stderr.getvalue()
self.assertRegex(
--
2.43.0
next prev parent reply other threads:[~2025-01-29 10:30 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-29 10:29 [PATCH RFC 0/6] Fix handling of optional blobs in binman Yannic Moog
2025-01-29 10:29 ` [PATCH RFC 1/6] tools: binman: ftest.py: fake ext blobs per default Yannic Moog
2025-02-10 13:06 ` Simon Glass
2025-02-13 7:15 ` Yannic Moog
2025-02-13 14:01 ` Simon Glass
2025-02-14 7:18 ` Yannic Moog
2025-02-14 13:48 ` Simon Glass
2025-02-17 7:07 ` Yannic Moog
2025-01-29 10:29 ` [PATCH RFC 2/6] tools: binman: ftest: pass allow_fake_blob to _DoReadFileDtb Yannic Moog
2025-02-10 13:09 ` Simon Glass
2025-01-29 10:29 ` Yannic Moog [this message]
2025-02-10 13:09 ` [PATCH RFC 3/6] tools: binman: ftest: fix tests that require non-faked ext blobs Simon Glass
2025-02-13 7:15 ` Yannic Moog
2025-01-29 10:29 ` [PATCH RFC 4/6] binman: fix faked optional entry handling Yannic Moog
2025-02-10 13:09 ` Simon Glass
2025-01-29 10:29 ` [PATCH RFC 5/6] binman: test: assert optional blobs don't cause non-functionality Yannic Moog
2025-02-10 13:07 ` Simon Glass
2025-01-29 10:29 ` [PATCH RFC 6/6] binman: doc: update Optional entries Yannic Moog
2025-02-10 13:08 ` Simon Glass
2025-02-13 7:21 ` Yannic Moog
2025-02-13 14:01 ` Simon Glass
2025-02-14 7:05 ` Yannic Moog
2025-02-14 13:48 ` Simon Glass
2025-02-17 7:21 ` Yannic Moog
2025-02-17 13:13 ` Simon Glass
2025-02-18 13:15 ` Yannic Moog
2025-02-19 0:01 ` Simon Glass
2025-02-10 13:08 ` [PATCH RFC 0/6] Fix handling of optional blobs in binman Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250129-binman_faked_optional-v1-3-a4534bc67cbb@phytec.de \
--to=y.moog@phytec.de \
--cc=alpernebiyasak@gmail.com \
--cc=b.hahn@phytec.de \
--cc=festevam@gmail.com \
--cc=sjg@chromium.org \
--cc=t.remmet@phytec.de \
--cc=tharvey@gateworks.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=upstream@lists.phytec.de \
--cc=y.varakala@phytec.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.