From: Danny Milosavljevic <dannym@scratchpost.org>
To: 31520@debbugs.gnu.org
Subject: [bug#31520] [PATCH] gnu: u-boot-tools: Enable tests.
Date: Fri, 18 May 2018 21:12:47 +0200 [thread overview]
Message-ID: <20180518191247.18456-1-dannym@scratchpost.org> (raw)
* gnu/packages/bootloaders.scm (dtc)[native-search-paths]: Add PYTHONPATH.
(u-boot-tools)[native-inputs]: Add openssl, python2-coverage, python2-pytest,
sdl.
[arguments]<#:make-flags>: Remove NO_SDL.
[arguments]<#:test-target>: Change to "tests".
[arguments]<#:phases>[patch]: New phase.
[arguments]<#:phases>[check]: Replace and move.
---
gnu/packages/bootloaders.scm | 49 +++++++++++++++++++++++++++++++++++++++++---
1 file changed, 46 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 333f30e72..4041f2320 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -33,6 +33,7 @@
#:use-module (gnu packages disk)
#:use-module (gnu packages bison)
#:use-module (gnu packages cdrom)
+ #:use-module (gnu packages check)
#:use-module (gnu packages cross-base)
#:use-module (gnu packages disk)
#:use-module (gnu packages firmware)
@@ -49,6 +50,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages sdl)
#:use-module (gnu packages swig)
#:use-module (gnu packages virtualization)
#:use-module (gnu packages web)
@@ -317,6 +319,10 @@ menu to select one of the installed operating systems.")
`(("bison" ,bison)
("flex" ,flex)
("swig" ,swig)))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "PYTHONPATH")
+ (files '("/lib/python2.7/site-packages")))))
(inputs
`(("python-2" ,python-2)))
(arguments
@@ -350,7 +356,11 @@ tree binary files. These are board description files used by Linux and BSD.")
(native-inputs
`(("bc" ,bc)
("dtc" ,dtc)
+ ("openssl" ,openssl)
("python-2" ,python-2)
+ ("python2-coverage" ,python2-coverage)
+ ("python2-pytest" ,python2-pytest)
+ ("sdl" ,sdl)
("swig" ,swig)))
(build-system gnu-build-system)
(home-page "http://www.denx.de/wiki/U-Boot/")
@@ -364,10 +374,34 @@ also initializes the boards (RAM etc).")
(inherit u-boot)
(name "u-boot-tools")
(arguments
- `(#:make-flags '("HOSTCC=gcc" "NO_SDL=1")
- #:test-target "test"
+ `(#:make-flags '("HOSTCC=gcc")
+ #:test-target "tests"
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "Makefile"
+ (("/bin/pwd") (which "pwd"))
+ (("/bin/false") (which "false")))
+ (substitute* "tools/dtoc/fdt_util.py"
+ (("'cc'") "'gcc'"))
+ (substitute* "test/run"
+ ;; Make it easier to find test failures.
+ (("#!/bin/bash") "#!/bin/bash -x")
+ ;; pytest doesn't find it otherwise.
+ (("test/py/tests/test_ofplatdata.py")
+ "tests/test_ofplatdata.py")
+ ;; This test would require git.
+ (("\\./tools/patman/patman") (which "true"))
+ ;; This test would require internet access.
+ (("\\./tools/buildman/buildman") (which "true")))
+ (substitute* "test/py/tests/test_sandbox_exit.py"
+ (("def test_ctrl_c")
+ "@pytest.mark.skip(reason='Guix has problems with SIGINT')
+def test_ctrl_c"))
+ (substitute* "tools/binman/binman.py"
+ (("100%") "99%")) ; TODO: Find out why that is needed.
+ #t))
(replace 'configure
(lambda* (#:key make-flags #:allow-other-keys)
(call-with-output-file "configs/tools_defconfig"
@@ -395,7 +429,16 @@ also initializes the boards (RAM etc).")
"tools/proftool"
"tools/fdtgrep"
"tools/env/fw_printenv"))
- #t))))))
+ #t)))
+ (delete 'check)
+ (add-after 'install 'check
+ (lambda* (#:key make-flags test-target #:allow-other-keys)
+ (apply invoke "make" "mrproper" make-flags)
+ (setenv "SDL_VIDEODRIVER" "dummy")
+ (setenv "PAGER" "cat")
+ (apply invoke "make" test-target make-flags)
+ (symlink "build-sandbox_spl" "sandbox")
+ (invoke "test/image/test-imagetools.sh"))))))
(description "U-Boot is a bootloader used mostly for ARM boards. It
also initializes the boards (RAM etc). This package provides its
board-independent tools.")))
next reply other threads:[~2018-05-18 19:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-18 19:12 Danny Milosavljevic [this message]
2018-05-26 18:26 ` [bug#31520] [PATCH] gnu: u-boot-tools: Enable tests Ludovic Courtès
2018-05-26 19:16 ` Danny Milosavljevic
2018-05-27 13:10 ` Ludovic Courtès
2018-05-27 22:05 ` Danny Milosavljevic
2018-05-28 7:57 ` Ludovic Courtès
2018-05-28 21:52 ` bug#31520: " Danny Milosavljevic
2018-05-29 14:33 ` [bug#31520] " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180518191247.18456-1-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=31520@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.