From patchwork Tue Aug 2 12:27:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1663000 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=BieCKK1T; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LxvS6418hz9s5W for ; Tue, 2 Aug 2022 22:29:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7FD1B8455E; Tue, 2 Aug 2022 14:29:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="BieCKK1T"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7831084547; Tue, 2 Aug 2022 14:29:05 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70054.outbound.protection.outlook.com [40.107.7.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6186F8455E for ; Tue, 2 Aug 2022 14:28:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=stefan.herbrechtsmeier-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dmwohUOa+tGe+8HDs0lu+jaSS1CnckMqW3taUk966AbF7uUzTkTL3AORUjbHECyXuxDMffy/agpqQ+ydYvjxPdMEvLqmIkGBfv2fQq+JAxxyB7VpD2qoNjpOKlJvOniSUyDlGLrl30/oR61E+IR3nPREU8OQ8PIBGmPdCJpOL3dhh2D69+5eVfV9/tVnuouQ6978AkDgoL+dbtBA38lnvxt+hZjRR5sDQK7Mm5kGQElMQwdlOpeO0BjBsjzXerwL9Z02TulBbLRnNQeNIaa9lPtRAR58RdfQl9CZXmYJGOCxEyLlAa+BeWV2bI9+UDU/Ij4aMXU2YdHGyreLkerFMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jTqF0Lbe3Su0iCojIgleI4rCxhziSri1dJk0XNKAakY=; b=nYXsKufSsMhTBMMM8m3Wc2UgnjoRbAfekzd9mGkj0jsGiKoi6wcqKEfPfhCP2Jmmlc/rkx4teg4lTJVkDDFKsX9JqKtMXufaiscAvXxtJny95dIUWfgjNVTadZH3+FFUyGbeyk//XpWnP6BWFXhtqpBn9+cvRuvhx0TU5Gsb/4mDPkwoCEUuJM3/9QhICLbEhu2lIMlu7zNt+IHmRmrGwhF3RaRx32YOwh9mnpSkNy/Z/cIwChKStlvhxzSV6ZH6J5wa68zyJWHELSg/cJFtjoUcmnFhcx2UrRhbiWuYDOaOBWZTBXbGI0zSNjghnE0el4N50fxhMYJeskdLvADbrw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jTqF0Lbe3Su0iCojIgleI4rCxhziSri1dJk0XNKAakY=; b=BieCKK1TI1V/Y7rp2ivP4IYLvAEYwD0YV/z5XNd74GtTRGbOQIMgRduL4LGo1GnRczqvmLL1T+EBUnQPyDbu0NolbA2kIf8pzwS+3GEWwFhkYoZtoM/ypNybzWTUARHpOKjMjTFHkr1/iPcDVkokLw2q3c9EjvsxzJQONozHqSY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by VI1PR08MB5470.eurprd08.prod.outlook.com (2603:10a6:803:136::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.12; Tue, 2 Aug 2022 12:28:57 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::49a6:e5ff:7f94:8787]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::49a6:e5ff:7f94:8787%7]) with mapi id 15.20.5482.016; Tue, 2 Aug 2022 12:28:57 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH 1/3] binman: Use low level compression commands in tests Date: Tue, 2 Aug 2022 14:27:56 +0200 Message-Id: <20220802122758.20155-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: FR0P281CA0073.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::13) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f262d55-7bfc-45d7-baa4-08da74829202 X-MS-TrafficTypeDiagnostic: VI1PR08MB5470:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nBKPXlGPQgjZOJ2V6hVReezLffj1mIdswr98wc6kfVCEA9tp26NIi7EGsHGgv5rdnuoCQ0SXlYqVaYbwhifypJRnKFhZ/8TjEIywLu97MfBCZr67UHkmVvcTV9ZCtMBUdu+808S+A6YKOigAr8WoHnMKdMjCh+MXM8X7wYdlNU/hwDJgVWQ26dLeWpPEIt4kwdgp6VNF02aU1hHdhlwnX73iEbuF2Aea/rvxiAzbr/kfejl+GfBUXchjGffdlc0D22a2cW6rVYKXiZj0u7EdM3nJAHjxhNXWlMY/B3m2GM0D1ZUvSiJtWypRUbseFfrVDZFHxk3xHgQLSrKLR09JAjt7omyS/+9iq1uCsFSoEX+VOkS1m/zR24GSXx0LPdm7cbjFY2ZXbyk8pzLdrlj/NxL3QPz0mv8sEPK0MTVcA8sqWFAJ+eTT2WtEATeFPChz+xb6UztEpW+Y+n0xSP26d9IDjwYlWA5W9oJoTRkLWOWqRRZCu98B6RvEH8zi0xDnpoAl9T1ZnlcuQalFMWb0V98xNlJESOj4DL1dQY0LFzATrGGsQLfWiZy8MGDuS2Eh5SU4L2VpntDbcy6fyQk4sGRfC7MWufmbba9hbK1Wszt5O2ZpuZ8N6G8OcIo4xyOnBm8jI2hDxLhwHMl3Qxc5ExmM4xS6FfyhpwUiik3LdBOf5AZHQJ1mgs3sfc6SDzhE7e5KX/8rfoQVWULjEbOW/0n3Ay9YAE6NyhQII8kNAvr/d6JYJ2Mq+Uk2ppIrRqGiNiAGu5wt475giLEJUYDSH4HdXmMKJT+QJjda7swdShw= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(376002)(366004)(346002)(39860400002)(136003)(396003)(186003)(1076003)(38100700002)(83380400001)(38350700002)(2616005)(4326008)(6916009)(66476007)(66556008)(66946007)(36756003)(8676002)(54906003)(316002)(8936002)(26005)(6512007)(478600001)(6486002)(6506007)(86362001)(52116002)(2906002)(41300700001)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fawqG5ITOeVxFYfmqdjqyYkoAJvWMMsf0uH125iEwpPDXCiJ7fMFWU30Fet6VaAtXft2mQEsHCdLb7DEvZFJnJtzPZ01hZyyNYmAW7cUSsp7IbmmLjbd1oXbAfjRDdUQJy8pOnsuzgrTHUASkXtp+7vGLg1HFbPERGpbgBy4a+7JzpsEfj9fijl9rYFfFskTq9dupyhRpaHl3XvpA1rJnYpfT8mAIKTsRjtB++0S3oRH1JQztEZiGV7VpaYQnx3NMNSIdtv9O1rhNjCJkDckNiqDh0hqdlenAHv5nTAB2L1QwDwAYj/ibTftSKrw7gFShFzlGuZ8zdxSe91NRYZNdcUq+uPIz4Vten98Izs52qEe/i5+RZjt5DJPVLe0aOBvwco4C3MTrmrdwulYwcMMbZn6ZytxpHZgpXogur6iFP1lajQpoQl2mOQMsxS4kMJVfuW0gT1x3elXFRA8aTUskkovFvMz9mDw99r7uF+Sx5ZxY2ntbWGhX9sQX8EX+TY4V3Xi3UCOhTOvaTk7Z3hxCooBUnDzc8dNMQg45pdaGLK/lGj8l2zOOiZZMt5PYYfvrNSna3SwOLoYjFAcZ2Rr/gMN8UMxSnDkqJBTAHxSKhbSyNJyWt2h+35yMydaw2kjd6DEx/b5B/vunL+2N15ziMlDAnLdq97H/g+OG5SiQacSQidFMkoycEg88jvZRZ6L8a9LJ0ez/+sZIhRRdotssT63GW6juS87v8qmyo8B0oG+5pvKcmeEqwnM60Qm3PWSDieZu7HY2eGCaFAvcchxraxShzAvI2nEEMfa/tdJmKuDzCD09VjpsFmGF6CPOpkmUGbbtnk5W5GzpWuNPZX2cAMfPJzRPNNIVn2SwxtIrXprpxU+IQXEK7ArEOVjo+dDtIT9QvpznYtPgpvaRJoi3Qa8KEKPnI66Gw3y09Rre2o6jWWK0+RFItXVD05c4Fs+BHK7W5kjgGNN6SX8ScumhSCIPSKZh60JiK2uIU35o9b/aBPh5W+r0lBRngsqxTbyx9JLP7tBm8uaQo+IYUDzrXtUwLt5Im53N37SYx9PZNn8p1wVzxDXkA2piTeVA8H5eoSrLuojnfDbK5IJMf6wxOABR0/GmYSFkFcLPJ+XIZzV6hKxBu7LJuL+5LrFT1Kkm/mlbqnzX6EHi9NQmZoLB3UrhP3FQDT+AfQVvxw6Xkt8dgqe4AJB4Nw2LJ7vRTdi84WH61vsUOp5/W3ykpeqoItS7hKVUJl7xkozVVu1w4GoNQ+Qqw+P6SpZ4DIMUNeSqGwZIdAgJXrNmGTky2lYNKk9rQAYxqaWjPLk1CQo1GAsnfgstYp3BEq3ejHqBNmJt19/VcIpRGkTF9iFcvPT9iltnP/f+mspN8y2fszb5EHYAXcSNmVU7gsZ+9fJDO1eOBqmv/UTkBUWEpGGieGPIOGZ51Qq7Q5J5xPz11gU9EjcXdMbTJ3w5ZYnthyD/y1Xdnl0ECQR/Cx8HEgWsN4QiLiCwy8P0kvtJwgfQg5VPsWQR4rnoO4PIxROVf68uJraV1wr26pTLVWw+X1wqGq2Y3dYkSdO6fZNLC84D+4GCf+mKm76Umqm5lUMHtY2CzN2rfXlmDIAKheqJ0JoWGyHSg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f262d55-7bfc-45d7-baa4-08da74829202 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2022 12:28:57.2600 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TJu8cExhnKCMJS71AaQa10uIxRfkAnEb2BkAWv2wTY7l1jxKaZ96seSr1gIJob+5v0OsXS+RLMneBczTzIMXgw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5470 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Stefan Herbrechtsmeier Use the low level compression commands in the tests to detect failures in the utilities to compress and decompress data. The decompression in U-Boot expects plain compression data without any header. Signed-off-by: Stefan Herbrechtsmeier --- This commit breaks the binman tests because the tests wrongly expects a header in front of the data. tools/binman/ftest.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index fa1f421c05..b1f564ed7d 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -107,6 +107,8 @@ BASE_DTB_PROPS = ['offset', 'size', 'image-pos'] # Extra properties expected to be in the device tree when allow-repack is used REPACK_DTB_PROPS = ['orig-offset', 'orig-size'] +# Tools +LZ4 = bintool.Bintool.create('lz4') class TestFunctional(unittest.TestCase): """Functional tests for binman @@ -1967,7 +1969,7 @@ class TestFunctional(unittest.TestCase): self._ResetDtbs() def _decompress(self, data): - return comp_util.decompress(data, 'lz4') + return LZ4.decompress(data) def testCompress(self): """Test compression of blobs""" @@ -2856,7 +2858,8 @@ class TestFunctional(unittest.TestCase): def testExtractCbfsRaw(self): """Test extracting CBFS compressed data without decompressing it""" data = self._RunExtractCmd('section/cbfs/u-boot-dtb', decomp=False) - dtb = comp_util.decompress(data, 'lzma', with_header=False) + lzma_alone = bintool.Bintool.create('lzma_alone') + dtb = lzma_alone.decompress(data) self.assertEqual(EXTRACT_DTB_SIZE, len(dtb)) def testExtractBadEntry(self): @@ -4412,6 +4415,9 @@ class TestFunctional(unittest.TestCase): } self.assertEqual(expected, props) + def _compress(self, data): + return LZ4.compress(data) + def testCompressExtra(self): """Test compression of a section with no fixed size""" self._CheckLz4() @@ -4427,15 +4433,17 @@ class TestFunctional(unittest.TestCase): rest = base[len(U_BOOT_DATA):] # Check compressed data - section1 = self._decompress(rest) - expect1 = comp_util.compress(COMPRESS_DATA + U_BOOT_DATA, 'lz4') - self.assertEquals(expect1, rest[:len(expect1)]) + expect1 = self._compress(COMPRESS_DATA + U_BOOT_DATA) + data1 = rest[:len(expect1)] + self.assertEquals(expect1, data1) + section1 = self._decompress(data1) self.assertEquals(COMPRESS_DATA + U_BOOT_DATA, section1) rest1 = rest[len(expect1):] - section2 = self._decompress(rest1) - expect2 = comp_util.compress(COMPRESS_DATA + COMPRESS_DATA, 'lz4') - self.assertEquals(expect2, rest1[:len(expect2)]) + expect2 = self._compress(COMPRESS_DATA + COMPRESS_DATA) + data2 = rest1[:len(expect2)] + self.assertEquals(expect2, data2) + section2 = self._decompress(data2) self.assertEquals(COMPRESS_DATA + COMPRESS_DATA, section2) rest2 = rest1[len(expect2):]