diff mbox series

[U-Boot,v2,23/37] binman: Use the tools.Decompress method

Message ID	20190708191856.138863-24-sjg@chromium.org
State	Accepted
Commit	ff5c7e383e8c053684fff263dd0afc7aeb8040fb
Delegated to:	Simon Glass
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Date: Mon, 8 Jul 2019 13:18:42 -0600 Message-Id: <20190708191856.138863-24-sjg@chromium.org> In-Reply-To: <20190708191856.138863-1-sjg@chromium.org> References: <20190708191856.138863-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 23/37] binman: Use the tools.Decompress method Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	binman: Add CBFS support \| expand [U-Boot,v2,00/37] binman: Add CBFS support [U-Boot,v2,01/37] x86: Add ifwitool for Intel Integrated Firmware Image [U-Boot,v2,02/37] cbfs: Add an enum and comment for the magic number [U-Boot,v2,03/37] cbfs: Rename checksum to attributes_offset [U-Boot,v2,04/37] tools: Drop duplicate raise_on_error argument [U-Boot,v2,05/37] binman: Fix comment in bsection.GetEntries() [U-Boot,v2,06/37] binman: Correct two typos in function names in ftest [U-Boot,v2,07/37] binman: Add coverage tools info for Python 3 [U-Boot,v2,08/37] patman: Add a way to set the search path for tools [U-Boot,v2,09/37] binman: Add a --toolpath option to set the tool search path [U-Boot,v2,10/37] binman: Add missing comments to bsection [U-Boot,v2,11/37] binman: Add missing comments toentry [U-Boot,v2,12/37] binman: Tidy up help for --indir [U-Boot,v2,13/37] binman: Use a better error for missing Intel descriptor [U-Boot,v2,14/37] binman: Detect skipped tests [U-Boot,v2,15/37] binman: Add a function to create a sample ELF file [U-Boot,v2,16/37] binman: Add a function to decode an ELF file [U-Boot,v2,17/37] binman: Ensure that coverage has access to site packages [U-Boot,v2,18/37] binman: Assume Intel descriptor is at the start of the image [U-Boot,v2,19/37] binman: Don't assume there is an ME region [U-Boot,v2,20/37] binman: Update entry.SetOffsetSize to be optional [U-Boot,v2,21/37] binman: Allow text directly in the node [U-Boot,v2,22/37] patman: Add functions to compress and decompress data [U-Boot,v2,23/37] binman: Use the tools.Decompress method [U-Boot,v2,24/37] binman: Drop unnecessary debug handling [U-Boot,v2,25/37] binman: Use tools compression function for blob handling [U-Boot,v2,26/37] binman: Correct comment in u_boot_spl_elf [U-Boot,v2,27/37] binman: Support ELF files for TPL [U-Boot,v2,28/37] binman: Fix up the _DoTestFile() function -u argument [U-Boot,v2,29/37] binman: Allow verbosity control when running tests [U-Boot,v2,30/37] binman: Allow preserving test directories [U-Boot,v2,31/37] binman: Pass the toolpath to tests [U-Boot,v2,32/37] patman: Add a function to write ifwitool [U-Boot,v2,33/37] binman: Add a utility library for coreboot CBFS [U-Boot,v2,34/37] binman: Add support for CBFS entries [U-Boot,v2,35/37] binman: Add support for Intel IFWI entries [U-Boot,v2,36/37] binman: Pad empty areas of the CBFS with files [U-Boot,v2,37/37] binman: Add support for fixed-offset files in CBFS

Commit Message

Simon Glass July 8, 2019, 7:18 p.m. UTC

Update the compression test to use the tools module to decompress the
output data.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

 tools/binman/ftest.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

Comments

Simon Glass July 18, 2019, 1:59 a.m. UTC | #1

Update the compression test to use the tools module to decompress the
output data.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

 tools/binman/ftest.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

Applied to u-boot-dm, thanks!

diff mbox series

Patch

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index c74e12d13c8..6ff871b3c16 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -59,7 +59,7 @@  BMPBLK_DATA           = b'bmp'
 VBLOCK_DATA           = b'vblk'
 FILES_DATA            = (b"sorry I'm late\nOh, don't bother apologising, I'm " +
                          b"sorry you're alive\n")
-COMPRESS_DATA         = b'data to compress'
+COMPRESS_DATA         = b'compress xxxxxxxxxxxxxxxxxxxxxx data'
 REFCODE_DATA          = b'refcode'
 
 
@@ -1560,16 +1560,7 @@  class TestFunctional(unittest.TestCase):
             self._ResetDtbs()
 
     def _decompress(self, data):
-        out = os.path.join(self._indir, 'lz4.tmp')
-        with open(out, 'wb') as fd:
-            fd.write(data)
-        return tools.Run('lz4', '-dc', out, binary=True)
-        '''
-        try:
-            orig = lz4.frame.decompress(data)
-        except AttributeError:
-            orig = lz4.decompress(data)
-        '''
+        return tools.Decompress(data, 'lz4')
 
     def testCompress(self):
         """Test compression of blobs"""