me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Maxim Cournoyer 2020-09-18 08:46:27 -04:00
parent d5d80a62b7
commit afeed71ae4
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gnu/packages/virtualization.scm
View File

@ -179,6 +179,24 @@
'("include") '("include")
input-directories) input-directories)
#t))) #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 (add-after 'patch-source-shebangs 'patch-/bin/sh-references
(lambda _ (lambda _
;; Ensure the executables created by these source files reference ;; Ensure the executables created by these source files reference
@ -243,19 +261,6 @@
exec smbd $@"))) exec smbd $@")))
(chmod "samba-wrapper" #o755) (chmod "samba-wrapper" #o755)
(install-file "samba-wrapper" libexec)) (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))))) #t)))))
(inputs ; TODO: Add optional inputs. (inputs ; TODO: Add optional inputs.
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)