From patchwork Fri May 3 22:19:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 63945 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 AF24427BBEE; Fri, 3 May 2024 23:46:28 +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=ham 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 84EDD27BBEA for ; Fri, 3 May 2024 23:46:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s31f1-0000u5-CS; Fri, 03 May 2024 18:45:47 -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 1s31eR-0008JW-Oh for guix-patches@gnu.org; Fri, 03 May 2024 18:45:12 -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 1s31eQ-0004Dc-QJ for guix-patches@gnu.org; Fri, 03 May 2024 18:45:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s31en-0006TO-Df for guix-patches@gnu.org; Fri, 03 May 2024 18:45:33 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70735] [PATCH 093/714] 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: Fri, 03 May 2024 22:45:33 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70735 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70735@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 70735-submit@debbugs.gnu.org id=B70735.171477632624751 (code B ref 70735); Fri, 03 May 2024 22:45:33 +0000 Received: (at 70735) by debbugs.gnu.org; 3 May 2024 22:45:26 +0000 Received: from localhost ([127.0.0.1]:49660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s31ef-0006Qo-KQ for submit@debbugs.gnu.org; Fri, 03 May 2024 18:45:26 -0400 Received: from 10.mo575.mail-out.ovh.net ([46.105.79.203]:44623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s31ed-0006Pb-0L for 70735@debbugs.gnu.org; Fri, 03 May 2024 18:45:23 -0400 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.25.156]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4VWQqH4lZdz1TMh for <70735@debbugs.gnu.org>; Fri, 3 May 2024 22:44:59 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-ns6tl (unknown [10.110.168.127]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 631301FD54; Fri, 3 May 2024 22:44:59 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-6684bf9d7b-ns6tl with ESMTPSA id /ViqFetoNWYpQgIAvxtVsg (envelope-from ); Fri, 03 May 2024 22:44:59 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S002897a7d4c-f481-404d-95a2-531d2e947e6c, DD66FAD6BDE8F99CDE76407431BDB49D27B016D9) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sat, 4 May 2024 00:19:35 +0200 Message-ID: <20240503224254.28001-93-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240503224254.28001-1-ngraves@ngraves.fr> References: <20240503224254.28001-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 7560136402807481058 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvddvuddgudegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgepuddtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtjeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht 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 0e7bc66bd7..cf568b2bd6 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"