branch master updated: gnu: qemu: Reinstate the iothreads-commit-active test.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 076b3384df gnu: qemu: Reinstate the iothreads-commit-active test.
076b3384df is described below

commit 076b3384dfa29ae118d0375d516376a7fe98a197
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Sep 12 09:29:22 2023 -0400

    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.
---
 gnu/packages/virtualization.scm | 17 +++++++++--------
 1 file 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)