[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: gnu: qemu: Disable the bios-tables-test test.
From: |
guix-commits |
Subject: |
02/06: gnu: qemu: Disable the bios-tables-test test. |
Date: |
Sat, 19 Sep 2020 23:22:40 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit afeed71ae447ea18f7bc1b0b331e73e995308251
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Sep 18 08:46:27 2020 -0400
gnu: qemu: Disable the bios-tables-test test.
This works around <https://issues.guix.info/43048>.
* gnu/packages/virtualization.scm (qemu)[phases]{disable-unusable-tests}:
Move
after unpack. Combine the existing substitute patterns on a single usage of
substitute*. Disable the bios-tables-test test in
tests/qtest/Makefile.include.
---
gnu/packages/virtualization.scm | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index cf73802..9955045 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -179,6 +179,24 @@
'("include")
input-directories)
#t)))
+ (add-after 'unpack 'disable-unusable-tests
+ (lambda _
+ (substitute* "tests/Makefile.include"
+ ;; Comment out the test-qga test, which needs /sys and
+ ;; fails within the build environment.
+ (("check-unit-.* tests/test-qga" all)
+ (string-append "# " all))
+ ;; Comment out the test-char test, which needs networking and
+ ;; fails within the build environment.
+ (("check-unit-.* tests/test-char" all)
+ (string-append "# " all)))
+ (substitute* "tests/qtest/Makefile.include"
+ ;; Disable the following test, which triggers a crash on some
+ ;; x86 CPUs (see https://issues.guix.info/43048 and
+ ;; https://bugs.launchpad.net/qemu/+bug/1896263).
+ (("check-qtest-i386-y \\+= bios-tables-test" all)
+ (string-append "# " all)))
+ #t))
(add-after 'patch-source-shebangs 'patch-/bin/sh-references
(lambda _
;; Ensure the executables created by these source files reference
@@ -243,19 +261,6 @@
exec smbd $@")))
(chmod "samba-wrapper" #o755)
(install-file "samba-wrapper" libexec))
- #t))
- (add-before 'check 'disable-unusable-tests
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "tests/Makefile.include"
- ;; Comment out the test-qga test, which needs /sys and
- ;; fails within the build environment.
- (("check-unit-.* tests/test-qga" all)
- (string-append "# " all)))
- (substitute* "tests/Makefile.include"
- ;; Comment out the test-char test, which needs networking and
- ;; fails within the build environment.
- (("check-unit-.* tests/test-char" all)
- (string-append "# " all)))
#t)))))
(inputs ; TODO: Add optional inputs.
`(("alsa-lib" ,alsa-lib)
- branch master updated (6b12537 -> 4d82e8e), guix-commits, 2020/09/19
- 01/06: gnu: qemu: Update to 5.1.0., guix-commits, 2020/09/19
- 02/06: gnu: qemu: Disable the bios-tables-test test.,
guix-commits <=
- 03/06: gnu: qemu: Fix indentation., guix-commits, 2020/09/19
- 04/06: gnu: qemu: Enable parallel tests., guix-commits, 2020/09/19
- 06/06: gnu: qemu: Move HTML documentation to the doc output., guix-commits, 2020/09/19
- 05/06: gnu: qemu: Install the full documentation as an info manual., guix-commits, 2020/09/19