diff options
| author | Tom Rini <[email protected]> | 2025-05-27 07:43:04 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-05-27 07:43:04 -0600 |
| commit | 6015a24a5a2647ab044333ed8e2462f90f855e36 (patch) | |
| tree | 53fe80bee534a17f6c40e697cc112287a0b4b3c5 /doc/develop | |
| parent | 39b815d02d7ce6af32bcf023d20243c404b75a84 (diff) | |
| parent | ec2482a24ac3a1d0beadae80bcb28c8d89b4c1ab (diff) | |
Merge tag 'dm-next-27may25' of git://git.denx.de/u-boot-dm into next
Sync up Python tools from my tree
- minor binman tweaks
- terminal improvements in u_boot_pylib
- patman move to asyncio
- patman support for new 'series' subcommand
Diffstat (limited to 'doc/develop')
| -rw-r--r-- | doc/develop/binman_tests.rst | 6 | ||||
| -rw-r--r-- | doc/develop/pics/patman.jpg | bin | 0 -> 97131 bytes |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/develop/binman_tests.rst b/doc/develop/binman_tests.rst index a632694a6fe..5e44686b8ad 100644 --- a/doc/develop/binman_tests.rst +++ b/doc/develop/binman_tests.rst @@ -431,11 +431,11 @@ error message produced by Binman. Sometimes you need to add several tests, each with their own broken image description, in order to check all the error cases. Sometimes you need to capture the console output of Binman, to check it is -correct. You can to this with ``test_util.capture_sys_output()``, for example: +correct. You can to this with ``terminal.capture()``, for example: .. code-block:: python - with test_util.capture_sys_output() as (_, stderr): + with terminal.capture() as (_, stderr): self._DoTestFile('071_gbb.dts', force_missing_bintools='futility', entry_args=entry_args) err = stderr.getvalue() @@ -572,7 +572,7 @@ In the above example, here are some possible steps: def testNxpImx8ImageMkimageMissing(self): """Test that binman can produce an iMX8 image""" - with test_util.capture_sys_output() as (_, stderr): + with terminal.capture() as (_, stderr): self._DoTestFile('339_nxp_imx8.dts', force_missing_bintools='mkimage') err = stderr.getvalue() diff --git a/doc/develop/pics/patman.jpg b/doc/develop/pics/patman.jpg Binary files differnew file mode 100644 index 00000000000..2dcf598e088 --- /dev/null +++ b/doc/develop/pics/patman.jpg |
