diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-09-12 09:29:22 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-09-12 09:59:47 -0400 |
| commit | 076b3384dfa29ae118d0375d516376a7fe98a197 (patch) | |
| tree | 419960b178abed5d2480e630772a0032a60c096c /gnu/packages/virtualization.scm | |
| parent | 9996896dc252a02ba3b17473a685ce8957237546 (diff) | |
| download | guix-076b3384dfa29ae118d0375d516376a7fe98a197.tar guix-076b3384dfa29ae118d0375d516376a7fe98a197.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5c5225b694..f5bdedd45e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -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) |