From patchwork Sat Jun 1 15:36:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 65110 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6493427BBE9; Sat, 1 Jun 2024 16:41:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A8EA227BBE2 for ; Sat, 1 Jun 2024 16:41:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sDQpt-0000wM-CY; Sat, 01 Jun 2024 11:40:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sDQpr-0000uf-RE for guix-patches@gnu.org; Sat, 01 Jun 2024 11:39:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sDQpq-0007hP-Cy for guix-patches@gnu.org; Sat, 01 Jun 2024 11:39:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sDQq2-0003gE-2o for guix-patches@gnu.org; Sat, 01 Jun 2024 11:40:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70858] [PATCH python-team v2 08/32] gnu: u-boot-tools: Remove python-coverage native-input. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Jun 2024 15:40:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70858 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70858@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 70858-submit@debbugs.gnu.org id=B70858.171725637713833 (code B ref 70858); Sat, 01 Jun 2024 15:40:10 +0000 Received: (at 70858) by debbugs.gnu.org; 1 Jun 2024 15:39:37 +0000 Received: from localhost ([127.0.0.1]:57146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDQpV-0003aw-D6 for submit@debbugs.gnu.org; Sat, 01 Jun 2024 11:39:37 -0400 Received: from 13.mo550.mail-out.ovh.net ([178.33.253.128]:55283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDQpT-0003aZ-8t for 70858@debbugs.gnu.org; Sat, 01 Jun 2024 11:39:36 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.140.75]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4Vs40p169Sz1R33 for <70858@debbugs.gnu.org>; Sat, 1 Jun 2024 15:39:22 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-l9t2q (unknown [10.110.168.179]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id DDD981FD4A; Sat, 1 Jun 2024 15:39:21 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-l9t2q with ESMTPSA id fxN2M6lAW2b2rxAAJgqQVA (envelope-from ); Sat, 01 Jun 2024 15:39:21 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G00448784517-5667-4673-82c8-e4b448a5cc8b, 066A105622CFB65C0C1E9735678F98E7108F9FA5) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sat, 1 Jun 2024 17:36:40 +0200 Message-ID: <20240601153854.30805-9-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240601153854.30805-1-ngraves@ngraves.fr> References: <20240601153854.30805-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4659536767527215842 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdekkedgleduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdekheekseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (u-boot-tools): [native-inputs]: Remove python-coverage. [arguments]<#:phases>: Adapt patch phase. Change-Id: I94394544079197b4a3f8c53cc0b3d78d1f5dc8be --- gnu/packages/bootloaders.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 0e7bc66bd75..cf568b2bd6a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -802,8 +802,7 @@ (define-public u-boot-tools (name "u-boot-tools") (native-inputs (modify-inputs (package-native-inputs u-boot) - (prepend python-coverage - python-filelock + (prepend python-filelock python-pycryptodomex python-pytest python-pytest-xdist @@ -820,14 +819,6 @@ (define-public u-boot-tools (("/bin/false") (which "false"))) (substitute* "tools/dtoc/fdt_util.py" (("'cc'") "'gcc'")) - (substitute* "tools/u_boot_pylib/test_util.py" - ;; python3-coverage is simply called coverage in guix. - (("python3-coverage") "coverage") - - ;; Don't require 100% coverage since it's brittle and can - ;; fail with newer versions of coverage or dependencies. - (("raise ValueError\\('Test coverage failure'\\)") - "print('Continuing anyway since Guix does not care :O')")) (substitute* "test/run" ;; Make it easier to find test failures. (("#!/bin/bash") "#!/bin/bash -x") @@ -838,9 +829,9 @@ (define-public u-boot-tools ;; FIXME: test_spl fails, needs further investiation (("test_ofplatdata or test_handoff or test_spl") "test_ofplatdata or test_handoff") - ;; FIXME: code coverage not working - (("run_test \"binman code coverage\"") - "# run_test \"binman code coverage\"") + ;; Disable code coverage tests. + (("run_test \"(\\w+) code coverage\"" all) + (string-append "# " all)) ;; This test would require internet access. (("\\./tools/buildman/buildman") (which "true"))) (substitute* "test/py/tests/test_sandbox_exit.py"