me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Maxim Cournoyer 2023-09-12 09:29:22 -04:00
parent 9996896dc2
commit 076b3384df
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/virtualization.scm
View File

@ -385,6 +385,14 @@
(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 @@ server and embedded PowerPC, and S390 guests.")
#~(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)