From patchwork Mon Aug 8 10:51:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1664522 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=FfrNSlVR; 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 4M1Y1t1nzLz9s2R for ; Mon, 8 Aug 2022 20:52:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0DEF98419C; Mon, 8 Aug 2022 12:52:04 +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="FfrNSlVR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 13C6784164; Mon, 8 Aug 2022 12:51:57 +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 EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80087.outbound.protection.outlook.com [40.107.8.87]) (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 0F74E8416E for ; Mon, 8 Aug 2022 12:51:52 +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=R9YY+eHD2GqHJiaZGvmfEiclxtGh/xrYaO4A5RoVtcBiBOwriOqUWuoRTOFfBgsbB/YEpSYBGVi1vFrkZ0lS9XS+7EGeQoWJudzJoSa/cg5heWhrpiePLhEmLwOk4U0MYdaVjFBJOj/8qV4RUND7JVke7Ttm0gncRDMGiy57RgvDb02x0cDA9F6Gv3tXFdB4CKaU1PixmuqpnYM9sovA361FJWmCMa0Kr6bQugXRLk+C4ik6Wa7Iq9NyJJCLBTKq7YW0QhDmlTkkI4aVnRJJqb+MhZSmziwr9QnQyXqF1mAU2JYSZ69nY6x+JiKFMYcNtY752DeioajGGZGJ5RX3LA== 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=/JC2AetnrSCEGL0IRZ6TkRTV/L0lR1TMG2PbclUg+TI=; b=c6RLmGt8xzZTDKaGJA4GkXA+kOiJwTXUCCbocVroizR/DTnBcOF+xEeMh5VPj+vyzMhaOWbGnmM3h0Bv+oWcf5A2CJQse0f7j97hZSSIVL9q3oGTV0z9ZPj1pmjivBHFpt22vfZPUe8go1yOT/PEfF+x1QUl2xWHkcIb64S4hmZh4gCnNc2qZqbBJL3LGPqrwt02x7itAwIRLgaNRS2+kXz5Fh1pygAVPSUZUKE/8M6aXgAoJsbWW0zrEdv8ePLGmOiP6zb3mvuFIZDBkH02OaL4UFLarGTYsd2Vqvgpjjy5guXFTHg4B58XSHGCtRYgBpf0EjzClMpVpCnNXJzfSw== 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=/JC2AetnrSCEGL0IRZ6TkRTV/L0lR1TMG2PbclUg+TI=; b=FfrNSlVRYOk6HNB9BMPu0K2ue4r4ahhlNjUUicWryYC01pco4Ngh6qVE2HAKWdLw5wZYcT0tpXVOEKtJIVe+4Hf1QTxqRN8BLaqo3ntBVFqOaoGuCUsToc0ff+yKvSlFO1c+9pVaSEztK0+xFF5rShc9qh9LjfvkVuXFj38yfPU= 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 DB6PR0802MB2487.eurprd08.prod.outlook.com (2603:10a6:4:9e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.15; Mon, 8 Aug 2022 10:51:50 +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.5504.020; Mon, 8 Aug 2022 10:51:50 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v2 04/10] binman: Add compression tests Date: Mon, 8 Aug 2022 12:51:19 +0200 Message-Id: <20220808105125.21356-4-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220808105125.21356-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220808105125.21356-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR0P281CA0058.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::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: c3e5de0f-259f-4bf1-8e0d-08da792bffa2 X-MS-TrafficTypeDiagnostic: DB6PR0802MB2487:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: haHOxolXkqwlypUqW8t6oyHop+OwLAVyaYLU4tpuEHz/o4/LpFDoGCCV+YjuBP9+BHbaW2r36ynriS3IxYG/NHKo/2c5vz6fCLuzcvsEid09wEXBbFRZsfIIxQvOhaG0J1homtotDPFWuP2y6apr19OF8X30j3gTXeJMk/WIGQvTJVduJKcyY/6y5Wmb1WVQnInCog/oU5kecRO7V16wpijP7FzsGe+4HsrP7FEx7rQvK1keD+U+7aeW04B6aOnhTA9I/nD/uEEChAAEhfPna4C5uNG9c4LwgIqMueeMWHMKhHKgdmVegCI43LRdUCFptJe1P1zWgQWlght2J6ttl9KlG5ZxKE9giLmxdcqfX7fQT1dOflwKdZRuyVt08Ebuv2kSnwGW2QPiB1czKAl4aNOSynEKNL9+YLREbsHEZOrBTgk7mXfWWCdgKoUOjoK2Y3ZIWzPPlyTOt3h8HIu8xV5jVxzgLI6VeiXj0Xvs1hVvBSHAtPRAujAALKs/S4Y7sd+QQcnXn1s7le2EaprolTlnljYhbl70UDEWAcvVUSnyizRzTg0+EV57fH1Y6YM7M2toUgofXKJuioDx+zyyFX8Kb3kcGA4P+5eHQ5PEsBRlE4AfL+VV4XPt4uqfgXHy8Jw0GzERFspfpHMvR27p+ue0WzEtFw9av6OQ2me2v92c5yDi3+0M6DYHLensQiEXH96uP7z5dmc23jRfpbCr8YPXKM1q8GUdtmSEI/agagLUCYPvI03MjMClWya9R7arzKzG2xfJPH8kuNBUDUs/3B28Imy57zf8vfPvr9w9cIxR03DKJmnOUlBnX1ihFW+w7eQ8TbtEm1rMjGl+DawhHA== 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)(346002)(136003)(366004)(39860400002)(396003)(6666004)(2906002)(6512007)(26005)(41300700001)(52116002)(6506007)(38100700002)(38350700002)(2616005)(186003)(1076003)(478600001)(966005)(36756003)(4326008)(8676002)(66476007)(66556008)(8936002)(86362001)(6486002)(66946007)(6916009)(316002)(54906003)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mH9khXeGQpFqyiiizbEBBH8UYzTTTU97IB8o6Ulw6Gx7Hd8wOX69iimtroJ4mBWDxfWUGv8JBuzVzt8565neVNuv4qbU8oIza+gzWc5t47FUtldH0vWv7WFVVTnB6y4qi6WS8ezOxzD0IaFVFARHWajEenO0SY+Hew4BZsj3aVIpVIyAy3avmB4GGnYNK4Xd8LCWcKeYqmFYhWNEAaTjfm/r84ci8mUMK3R1iPWA8rUgAK45Sj6FuN+TnMIDpd5tY9WzYGyWtQeUIoAU1AemRWYtuf6fuWCoBV4Kfy2xPdHhAyUKQlZU9FBzD57mv5daNXY0JQeCRBqCkvH2LHgfCby4msgZl19nRySlfklI7eWcupg5Cq88QpLMH8g+tK+cLXICHB0sUn4CXF+RQz/NgiwtCV/lfRcvGIgb4P7L9vXOFFiPrDj060UDDAb5HFQciqd52pFk2pVWrsju2lFpdO9oDunUyc4YcNr7Q418KE7e+D+esC/NjDx2gcf1nraUHepZrJcnHM3gA8sZ3Cp64W+yqCRDZJIyEJ4llMkURwGv94Y4LADOjwyKL33V1uk2kddfoUECymN5Xbf7jYbunqPTDpTGg3CO58TH2E9o9y3O53K1+42b1chdN5XtKa0jflBQVSZUetZcNxnvaAT3sDJvIpkbWx269vmfx+SASlfLm2t63P5c0KgfoCWs1BCNig3GyDxFQNTsUWWr46vrMM7YjxIL+zeCzAdJUqocbJyZuL6LwoUoX1C5WBKO/girw1T/BX/4wZvGPLX9saAm/3zDAyB5zh4oSzJHD01pODYKh7aqWRI8OSkO2O06bj9IQaipImpvVbmOrrFdduFWthrwJETTiW08qe9tvAZp2hevbt1Ve/AK6I7y4Jf18JBsQ6WUS2QNHOe0MV2QnF/TtZlYtGPJkc9GkxmrJOJS1c8pr/qCUhJMa5QtzvapK3mkzZIwzrYLxKEgWJwfXvQ4B/ZW970qDhNW0FhroGqM/y0OFfyR49oYIkueZwdVjYeyP8cf9PyPPa5jbn9L8AUu8h6eUml5q7M+znpLPluiVJ52jEqMBrkJMMX6O+Er8qu1hr+pRXsJ8SyNLj2UmuzbF8tAsRi24NsDMUICnjC91aksSGmobYQi6/vFIzaPaXwW2ZNnCTdW7mhtceeNfQRkyGffyK4CFA8+DbwENqgzL/qhg6q6aqt5Lo/7VZ8BqdUHTlirgtIA+OjPjW68X3g0bMpXfaXuJv7KK3hos/q96ls96Y8hQTLEywoYd43Fcnqquu8Gi4faDCsLNvRQKjiUEp9VIJOG1l7i3d6HgJiEH73vOAlV6Y6S7+HAqpr3oaNNBXw8Hny42x7464Y2/pYNDFKtrxoev4RvtyOcFkZH8fTpCPFVMvI7nQ87WvF9W6It1JJAIVJmG3DfM5mpOcYDNo8mow+uM2g6szVOlTq5fH3ypfCCwghaBf1xXxyFuHmIaRwlPG6/sOWe/6wNqoUhY1692TxBw2RxBkxBXsTepoU0Bla92uqOxeQMD2DF3KBMSUlOUCYm1PodaJ8HOJEZJLBzRp7wmAC4N458PK0ugqCn+/BQXpxHS51TgoRAIyI3ntr/vK+JOW/wtQGM6hR58g== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3e5de0f-259f-4bf1-8e0d-08da792bffa2 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2022 10:51:50.7163 (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: obejugKOPbgrCHJoU5D/PXIY4X3v6aMK1/9ACuQG4k6yfqFCXkR6giJ+efvffbhSvbP9KUO6XM1uIJxunyX4MA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0802MB2487 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 v2: - Added tools/binman/ftest.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 96c15cff77..c9b67c48d6 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -5248,6 +5248,30 @@ fdt fdtmap Extract the devicetree blob from the fdtmap comp_util.decompress(b'1234', 'invalid') self.assertIn("Unknown algorithm 'invalid'", str(e.exception)) + def testCompressions(self): + """Test compression algorithms""" + for algo in comp_util.COMPRESSIONS: + data = comp_util.compress(COMPRESS_DATA, algo) + self.assertNotEqual(COMPRESS_DATA, data) + orig = comp_util.decompress(data, algo) + self.assertEquals(COMPRESS_DATA, orig) + + def testVersions(self): + """Test tool version of compression algorithms""" + for algo in comp_util.COMPRESSIONS: + tool = comp_util._get_tool(algo) + version = tool.version() + print('%s - %s' % (algo, version)) + self.assertRegex(version, '^v?[0-9]+[0-9.]*') + + def testPadding(self): + """Test padding of compression algorithms""" + for algo in comp_util.COMPRESSIONS: + data = comp_util.compress(COMPRESS_DATA, algo) + data = data + 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):