[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
94/155: gnu: grub: Use qemu-minimal for tests.
From: |
John Darrington |
Subject: |
94/155: gnu: grub: Use qemu-minimal for tests. |
Date: |
Wed, 21 Dec 2016 20:48:36 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit d098bd568db6159a50c8a6f45523cab43c60b1dc
Author: Marius Bakke <address@hidden>
Date: Mon Dec 19 23:22:07 2016 +0100
gnu: grub: Use qemu-minimal for tests.
* gnu/packages/grub.scm (qemu-for-tests): Remove variable.
(grub)[native-inputs]: Replace QEMU-FOR-TESTS with QEMU-MINIMAL.
---
gnu/packages/grub.scm | 35 ++---------------------------------
1 file changed, 2 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index 83304b8..866dfcf 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -36,38 +36,7 @@
#:use-module (gnu packages man)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages ncurses)
- #:use-module (gnu packages cdrom)
- #:use-module (srfi srfi-1))
-
-(define qemu-for-tests
- ;; Newer QEMU versions, such as 1.5.1, no longer support the 'shutdown'
- ;; instruction. This leads to test hangs, as reported at
- ;; <https://bugs.launchpad.net/bugs/947597> and fixed at
- ;; <http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/4828>.
- ;; Work around it by using an older QEMU.
- (package (inherit qemu-minimal)
- (version "1.3.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://wiki.qemu-project.org/download/qemu-"
- version ".tar.bz2"))
- (sha256
- (base32
- "1bqfrb5dlsxm8gxhkksz8qzi5fhj3xqhxyfwbqcphhcv1kpyfwip"))))
-
- ;; With recent GLib versions, we get a test failure:
- ;; ERROR:tests/rtc-test.c:176:check_time: assertion failed (ABS(t - s)
<= wiggle): (382597824 <= 2)
- ;; Simply disable the tests.
- (arguments `(#:tests? #f
- ,@(substitute-keyword-arguments (package-arguments
qemu-minimal)
- ((#:phases phases)
- ;; We disable the tests so we also skip the phase
disabling
- ;; the qga test, which fails due to changes in QEMU
- `(modify-phases ,phases
- (delete 'disable-test-qga))))))
-
- ;; The manual fails to build with Texinfo 5.x.
- (native-inputs (alist-delete "texinfo" (package-native-inputs qemu)))))
+ #:use-module (gnu packages cdrom))
(define unifont
;; GNU Unifont, <http://gnu.org/s/unifont>.
@@ -160,7 +129,7 @@
;; Dependencies for the test suite. The "real" QEMU is needed here,
;; because several targets are used.
("parted" ,parted)
- ("qemu" ,qemu-for-tests)
+ ("qemu" ,qemu-minimal)
("xorriso" ,xorriso)))
(home-page "https://www.gnu.org/software/grub/")
(synopsis "GRand Unified Boot loader")
- 126/155: build: Delete all the .service and .conf files upon 'make clean'., (continued)
- 126/155: build: Delete all the .service and .conf files upon 'make clean'., John Darrington, 2016/12/21
- 134/155: gnu: borg: Update to 1.0.9., John Darrington, 2016/12/21
- 136/155: gnu: mailutils: Update to 3.1.1., John Darrington, 2016/12/21
- 137/155: gnu: mailutils: Use 'modify-phases' syntax., John Darrington, 2016/12/21
- 130/155: environment: Add '--root' option., John Darrington, 2016/12/21
- 144/155: gnu: imagemagick: Update to 6.9.7-0., John Darrington, 2016/12/21
- 149/155: gnu: jsoncpp: Update to 1.8.0., John Darrington, 2016/12/21
- 152/155: gnu: lablgtk: Update to 2.18.5, John Darrington, 2016/12/21
- 88/155: gnu: kdbusaddons: Embed kinit store dir, avoid dependency cycles., John Darrington, 2016/12/21
- 102/155: services: cuirass: Add 'log-file' option., John Darrington, 2016/12/21
- 94/155: gnu: grub: Use qemu-minimal for tests.,
John Darrington <=
- 101/155: gnu: cuirass: Add Git to 'PATH'., John Darrington, 2016/12/21
- 103/155: services: cuirass: Honor 'user' and 'group'., John Darrington, 2016/12/21
- 98/155: gnu: Add c-toxcore., John Darrington, 2016/12/21
- 104/155: services: cuirass: Cache defaults to /var/cache/cuirass., John Darrington, 2016/12/21
- 110/155: gnu: weechat: Use new xz-compressed tarball., John Darrington, 2016/12/21
- 127/155: gnu: gnupg: Update to 2.1.17., John Darrington, 2016/12/21
- 120/155: services: cuirass: Add 'cuirass' field., John Darrington, 2016/12/21
- 116/155: gnu: argon2: Update to 20161029., John Darrington, 2016/12/21
- 115/155: gnu: cppcheck: Update to 1.76.1., John Darrington, 2016/12/21
- 135/155: gnu: gnupg: Remove unneeded input., John Darrington, 2016/12/21