From patchwork Tue Aug 16 06:41:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1666688 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.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=dik0a/N2; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4M6M712d1lz1yft for ; Tue, 16 Aug 2022 16:43:41 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 237FA848E5; Tue, 16 Aug 2022 08:42:50 +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="dik0a/N2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ABD8D848AC; Tue, 16 Aug 2022 08:42:34 +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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50054.outbound.protection.outlook.com [40.107.5.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 AB3B5848B0 for ; Tue, 16 Aug 2022 08:42:27 +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=PdDFt3XEls9ke5gcmgG9CmSPIVe8B+P66DE41qV7jKSTcsT5xBeWpM5uEVkQrTg95AMac6H1P9kuqNpI+bBONj4F5i8DZwg1xLo/Bqz0uMbHFT3Axx8Sdu3iOezXrlKOIVsUVd3xGp+927+d8sM7rw/fuRbThdDmAVry5ejLOUK93K8/ZLXtNr5aoLN88IC3m4jPxl7tZrIYFGoNmVLS59eUawI1SQYUZ/Fx5GRNTSB8udEPYIk/evJEjx4Ij7PPRNCJnCeQJPsFNEKGewdWvfssbSJHTKOqlJNxdBGKVDzcfdvv/p+otm2EaP24ldXjj8PPfnImzIFh8rMO9ah8Hw== 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=agyVQJIVBeMMoWUGWS8luN99Qn14dtfTNjeNYOYUNhU=; b=JmxIgJk6LZKCcIxoq9iVbS9Tc9i8FOKaTR8SjV4wevpbTd1NT5U8gU4dxf1P5x1NSNTffqLAQMGAR95Z0LYQzKCAXloXzzJattKvIQllCVaZ675xLBlUPJny4vSv4qGQ+KaDXRP8lKiXnpGAPVEOiNon2+AnliGaVhIcQWTfyICZWpRAVmCg6ZTG/gSVhu/dGAaRIqF2lZMBb4LQt/tj2sNPUGsR4WQZNNyPw6enXC09GvNsaRUiIcpcHShBziCmp/TwipZV8obTIQxnMGDATh/LSpyq444iXi+/hXmCdKCiZg5YPMqZv5I2xrUpUZtwRAiwKMu8u74WjGQPlz+6Nw== 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=agyVQJIVBeMMoWUGWS8luN99Qn14dtfTNjeNYOYUNhU=; b=dik0a/N2ayNFSz8BvHE0qnWLgDxldw3wlZWiCj78IX4YaD9qXMDycvOJpXL6FISzWuyRVyDX9Ggc8hP3l5O4Rcf1ZNNWNMB1APo4Lns/yU0I5IUqy544NQIFfzkKITr5MHXvDiaGQJkRygzH7nKYalZZy976zYJJqxp4zVyGEKE= 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 VE1PR08MB4685.eurprd08.prod.outlook.com (2603:10a6:802:ae::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.25; Tue, 16 Aug 2022 06:42:26 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f95b:2e64:9ee6:4d44]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f95b:2e64:9ee6:4d44%3]) with mapi id 15.20.5525.011; Tue, 16 Aug 2022 06:42:26 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Simon Glass , Alper Nebi Yasak Subject: [PATCH v3 06/13] binman: Add compression tests Date: Tue, 16 Aug 2022 08:41:44 +0200 Message-Id: <20220816064151.9848-6-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220816064151.9848-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220816064151.9848-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0744.eurprd06.prod.outlook.com (2603:10a6:20b:487::19) 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: 2880719e-48d5-4364-62f2-08da7f527b9a X-MS-TrafficTypeDiagnostic: VE1PR08MB4685:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CSXIPdlnA04E8sXDZqN1yxtk878OhgWKet8lV4sYGATOxyazbhEqiHXlwFmbJKDb1n0NrBLiRAbS/DffdB58RWiYaYjizBUlTgd1OQN3MqQ5uvcYABvQqxyuGAmO0OtOv0wd7z2vPEOh0yIUcvv8rCxvLy98dzMwZwJ2o7KmF6nADpjbkqE40fx7SvRFpJtcr6HzmSKXCeWXSpCGej9QtVM226JBJI7RidR5qYO/UDKMUiXgonYfhuNuugzfmBx0ntaCeJalekNCWk0BDDGG9wTWRvLUDTiZki9PRfVkgZoZJ5+GDpdYiIMAFsuXRMpQNz8ZWlyHjuzckteNPKn0Hi8LChlAvQJ2w+UDlPS7B/9+9dDdOhKmP7h73Li+Cyed47H4K0UmtHGSj05sz2LAtGfKNPZuKQ91irdjDsQpPlvmU+SHLX3u7K3+nu+kdEW3ljTnSV5E+k+/6Fgz58kWsRePoSxkbyjMbcel+FupT+13tRyEcnUIdE0z/KLYdIE64i0nGZPHFVW80vVWwmC+0f3fpGn8AwOvSmWQDn0SXWpofeLdWbSynQsfdZWFs8Zs1gbQ9GecpYOKdUwecVUI3xo/3I3RvmC2S8YPqiD/NUZ8MLSmA+8G+E2xozLbSTYJIk9ea7+4d+UzHnoKAQjPjQNK1YDcts5bmp3yzOob8m/gFbhM/p9btkIi6mFQ+12BF0f1brPeHBuZGuF/JLLeuif+YlBeA5UmQKD958hIrx6xifD5doJEDrZNDIg6x8NqGnZq+emRsxvICWGntdV0oBVqz2HrWs8jAi02DgMV4wVUP4p8ekJ0FD8V+LSH1L1bT8N6PTQBiG8SSzQLUArnfA== 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)(136003)(366004)(396003)(346002)(376002)(39860400002)(86362001)(38350700002)(38100700002)(36756003)(316002)(8936002)(41300700001)(4326008)(66946007)(5660300002)(1076003)(66476007)(966005)(478600001)(8676002)(66556008)(6486002)(6512007)(26005)(52116002)(6506007)(2906002)(6666004)(186003)(2616005)(6916009)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NyBxq9JvFbye5cQv1fSSKJW6SwlydXMJo5aoQZwiAvQM6wuD1+R/WV2pBF0BcSVxPQNDSY2J44FgDNk71iV07+XWCILVPr3hfIFGWSpqiAo0QLRlOdmX5zXt3DlpzfDRf6jmbm1lOpBGj/5prXzAZIUh1uRdaIL6WRrWX9bWWjkMOxmvyJIzILphCbEjeJ0ZODon+I8loXRWAnlFaYGFXY5r0gith5D4NAuS0blu4BWkmoaefsyqUEpQQFYNRLIQN0Tm3er43uDHGGyRpvGyyHYhnnL2IRLQ90fDgNqWDfwWOU1tL5E7KrM+wJG6/OrHH/5hq7wCgQwkAyX9JZNpQBTtDR+cFn0FmW6dTZ1+Sn2L6dt83b93GbXNisKjrWPNg3wSRsOscyiBhHdATwOAuQme6Wqq/jdgRwvyGQhAunWuVdAf6HLizygf5Z/IUUg7G1I6JYlnZ1Bam8wUpspot/e26xJplu4E+S3zsIgA2GaOTrkYVmqrHmSeRD5p/b52N/TKboj7LHgVKrgI0T+uUfG/CjFrs02RRo7ocIqDWOuB+J0qorxBzup1ESJ1M/dRjdgAnQtqXLsTAA4wjtrXUpLq1QZ3usuKrGd8ypHz7O7ei9WBEWhFkCYPLhUYz5QI8FthLpaIdv2CLiAY2gEGLut5FGVk+pUt+yDp0jTtRxOX34OmVbRws6x0SX/B2otzX5HEQ6xcMyJ56qdHj0siX2dApKpMpcCDWsH07k4tHw6BOpln31rV3BrSHkeawnnb+asKJnN0CDgiVrgTEp9rL6eUFxsedrazGNjs7hqNlr/0rzrylNkcx7pTORQqlv6JDXeqgCwcO7C4wrnbxiY1Hu5MQyYmEfAcpG0qPJ1Bac+9fSRrIDQ6UWShtYg+emvu0A0NFWgxm9AIh6qAP9y7aA54bvKmTC71NKGNfdPa9iAO5DaBFO5UlDOhtQuWwTKsrXpwUTIvM1lGJKH6E+z2qQ/DNMznzUzCARX6Z0lLuNrmWTc5zNjEo1WgtVruN5UkY77gatEmk4j4N15eSrnvOQh2onokKlTXcymkAXZpm/yL3Szn1egPiIxsQCTkpgWjH1RR5xNcL4DhfBQf5PzJc39X6tCUPV1McBLpjqnMXm7WqyULIy0G+/ie7xu/giR2UnEb8Mbf7XiHNp/NTI46l0HN208GcrZFEOHB4lJ+hs7cXrVnL/4EmBSZteTb8iIeYyzeAlyT2jM7RaNuyTBu7ewIz6ZggIP1jSH243rCXVo2i6hYyMsvTYOCIBV24SmODnkNLSmWGMPueQ6iZ7ghCfGVIObhBI0LhVIjJR3pOjPchhXgCirW+4jgib0HYOGYiYo+w63USvfwqSuuxKU2KAugS7dsQ52LdHNstNN7nyWcvUR7SOo3dyTXSP4vSemFkJdrBKsyoPtt983So3n5mcpHv9flgQUwsullnqgPyfLtOVWpTjmj9tRwLRzw35mVez1Pb5gOs89GCcbpHUM5U8k948DMJ2cMhms56rm69IXJh4CEE3oKsEudEIe7Z8d5r1cynyTU4Qw/XVpOkBx7lCsfOXnQgVl4aF/gc6sNLsUwkhQqwXAWNjJuREb7uSP0g2p0pASfPjHHG3OTyYqa3A== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2880719e-48d5-4364-62f2-08da7f527b9a X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2022 06:42:26.5201 (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: J5vpi8dck8wiQN5nePvg3U9RJB5zH4Eyny5pOQYuRF8sgWQ4GfqG+yqI6TIAUGYcIPmPKExtRV+H7o/lKEIigQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB4685 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 Add common test functions to test all supported compressions. Signed-off-by: Stefan Herbrechtsmeier Reviewed-by: Simon Glass --- Instead of the for loop it is possible to use Parameterized [1] testing. [1] https://github.com/wolever/parameterized Changes in v3: - Use 'tools.get_bytes(0, 64)' instead of 'bytes([0]) * 64' - Check if tool is present - Rename tests Changes in v2: - Added tools/binman/ftest.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 96c15cff77..bc17107735 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -5248,6 +5248,37 @@ fdt fdtmap Extract the devicetree blob from the fdtmap comp_util.decompress(b'1234', 'invalid') self.assertIn("Unknown algorithm 'invalid'", str(e.exception)) + def _checkCompUtil(self, algo): + if not comp_util.is_present(algo): + self.skipTest('%s not available' % comp_util._get_tool_name(algo)) + + def testCompUtilCompressions(self): + """Test compression algorithms""" + for algo in comp_util.ALGORITHMS: + self._checkCompUtil(algo) + data = comp_util.compress(COMPRESS_DATA, algo) + self.assertNotEqual(COMPRESS_DATA, data) + orig = comp_util.decompress(data, algo) + self.assertEquals(COMPRESS_DATA, orig) + + def testCompUtilVersions(self): + """Test tool version of compression algorithms""" + for algo in comp_util.ALGORITHMS: + self._checkCompUtil(algo) + tool = comp_util._get_tool(algo) + version = tool.version() + print('%s - %s' % (algo, version)) + self.assertRegex(version, '^v?[0-9]+[0-9.]*') + + def testCompUtilPadding(self): + """Test padding of compression algorithms""" + for algo in comp_util.ALGORITHMS: + self._checkCompUtil(algo) + data = comp_util.compress(COMPRESS_DATA, algo) + data = data + tools.get_bytes(0, 64) + orig = comp_util.decompress(data, algo) + self.assertEquals(COMPRESS_DATA, orig) + def testBintoolDocs(self): """Test for creation of bintool documentation""" with test_util.capture_sys_output() as (stdout, stderr):