@@ -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"