Subject: [bug#70858] [PATCH v4 16/52] gnu: u-boot-tools: Remove python-coverage native-input.

From: Nicolas Graves <[email-masked]>
Date: Wed, 26 Feb 2025 04:10:24 +0100

* 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 4dab7bd0b7..753064cc43 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -825,8 +825,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)))
@@ -842,14 +841,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")
@@ -862,9 +853,9 @@ (define-public u-boot-tools
                 "# run_test \"sandbox_noinst\"")
                (("run_test \"sandbox_vpl\"")
                 "# run_test \"sandbox_vpl\"")
-               ;; 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"
-- 
2.48.1