futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: u-boot-tools: Update tests.

Browse Source 
* gnu/packages/bootloaders (u-boot-tools):
  Call tcheck target instead of all tests.
  Drop adjustment to test coverage percentage.
  Update substitution of python coverage binary.
  Re-enable coverage tests of dtoc and fdt.
  Disable additional configuration options that require OpenSSL.
This commit is contained in:
Vagrant Cascadian 2020-10-24 19:49:25 +00:00
parent 26c5e5af70
commit e9545e6d1d
No known key found for this signature in database
GPG Key ID: DC518FC87F9716AA
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/bootloaders.scm
View File

@ -482,7 +482,7 @@ also initializes the boards (RAM etc).")
,@(package-native-inputs u-boot))) ,@(package-native-inputs u-boot)))
(arguments (arguments
`(#:make-flags '("HOSTCC=gcc") `(#:make-flags '("HOSTCC=gcc")
#:test-target "tests" #:test-target "tcheck"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch (add-after 'unpack 'patch
@ -493,11 +493,8 @@ also initializes the boards (RAM etc).")
(substitute* "tools/dtoc/fdt_util.py" (substitute* "tools/dtoc/fdt_util.py"
(("'cc'") "'gcc'")) (("'cc'") "'gcc'"))
(substitute* "tools/patman/test_util.py" (substitute* "tools/patman/test_util.py"
;; python*-coverage is simply called coverage in guix. ;; python3-coverage is simply called coverage in guix.
(("%s-coverage") "coverage") (("python3-coverage") "coverage"))
;; XXX Allow for only 99% test coverage.
;; TODO: Find out why that is needed.
(("if coverage != '100%':") "if not int(coverage.rstrip('%')) >= 99:"))
(substitute* "test/run" (substitute* "test/run"
;; Make it easier to find test failures. ;; Make it easier to find test failures.
(("#!/bin/bash") "#!/bin/bash -x") (("#!/bin/bash") "#!/bin/bash -x")
@ -507,8 +504,6 @@ also initializes the boards (RAM etc).")
(("run_test \"binman\"") ": run_test \"binman\"") (("run_test \"binman\"") ": run_test \"binman\"")
;; FIXME: code coverage not working ;; FIXME: code coverage not working
(("run_test \"binman code coverage\"") ": run_test \"binman code coverage\"") (("run_test \"binman code coverage\"") ": run_test \"binman code coverage\"")
(("run_test \"dtoc code coverage\"") ": run_test \"dtoc code coverage\"")
(("run_test \"fdt code coverage\"") ": run_test \"fdt code coverage\"")
;; This test would require internet access. ;; This test would require internet access.
(("\\./tools/buildman/buildman") (which "true"))) (("\\./tools/buildman/buildman") (which "true")))
(substitute* "test/py/tests/test_sandbox_exit.py" (substitute* "test/py/tests/test_sandbox_exit.py"
@ -521,10 +516,12 @@ def test_ctrl_c"))
(("BASEDIR=sandbox") "BASEDIR=.")) (("BASEDIR=sandbox") "BASEDIR=."))
(for-each (lambda (file) (for-each (lambda (file)
(substitute* file (substitute* file
;; Disable signatures, due to GPL/Openssl ;; Disable features that require OpenSSL due
;; license incompatibilities. See ;; to GPL/Openssl license incompatibilities.
;; https://bugs.gnu.org/34717 for details. ;; See https://bugs.gnu.org/34717 for
(("CONFIG_FIT_SIGNATURE=y") "CONFIG_FIT_SIGNATURE=n") ;; details.
(("CONFIG_FIT_SIGNATURE=y")
"CONFIG_FIT_SIGNATURE=n\nCONFIG_UT_LIB_ASN1=n")
;; This test requires a sound system, which is un-used ;; This test requires a sound system, which is un-used
;; in u-boot-tools. ;; in u-boot-tools.
(("CONFIG_SOUND=y") "CONFIG_SOUND=n"))) (("CONFIG_SOUND=y") "CONFIG_SOUND=n")))