mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-31 23:06:59 +01:00
gnu: qemu: Reinstate the iothreads-commit-active test.
* gnu/packages/virtualization.scm (qemu) [arguments]: Add set-SOCK_DIR phase. (qemu-minimal) [arguments]: Delete the disable-extra-tests phase.
This commit is contained in:
parent
9996896dc2
commit
076b3384df
1 changed files with 9 additions and 8 deletions
|
@ -385,6 +385,14 @@ (define-public qemu
|
|||
(cut string-suffix?
|
||||
"-linux-user" <>))))))))
|
||||
|
||||
(add-before 'check 'set-SOCK_DIR
|
||||
(lambda _
|
||||
;; The default value for SOCK_DIR is TMPDIR, which can be long
|
||||
;; in the build chroot (e.g.:
|
||||
;; /tmp/guix-build-qemu-minimal-drv-0); set it to SOCK_DIR to
|
||||
;; avoid using more than 109 characters for socket files (the
|
||||
;; limit when using the kernel Linux).
|
||||
(setenv "SOCK_DIR" "/tmp")))
|
||||
(add-after 'install 'delete-firmwares
|
||||
(lambda _
|
||||
;; Delete firmares that are accessible on --firmwarepath.
|
||||
|
@ -542,14 +550,7 @@ (define-public qemu-minimal
|
|||
#~(modify-phases #$phases
|
||||
(delete 'configure-user-static)
|
||||
(delete 'build-user-static)
|
||||
(delete 'install-user-static)
|
||||
(add-after 'disable-unusable-tests 'disable-extra-tests
|
||||
(lambda _
|
||||
;; Interesting, the iothreads-commit-active test only fails in
|
||||
;; qemu-minimal, not the complete variant (see:
|
||||
;; https://gitlab.com/qemu-project/qemu/-/issues/1855).
|
||||
(delete-file
|
||||
"tests/qemu-iotests/tests/iothreads-commit-active")))))))
|
||||
(delete 'install-user-static)))))
|
||||
|
||||
;; Remove dependencies on optional libraries, notably GUI libraries.
|
||||
(native-inputs (filter (lambda (input)
|
||||
|
|
Loading…
Reference in a new issue