~ruther/guix-local: gnu: qemu-minimal: Fix building on riscv64-linux.

edfc3395fde137ed28ad90380872140640477ae2 — Efraim Flashner 1 year, 4 months ago dec47bd

gnu: qemu-minimal: Fix building on riscv64-linux.

* gnu/packages/virtualization.scm (qemu)[arguments]: Don't run the tests
in parallel when building for riscv64-linux.  Adjust riscv64's
'disable-some-tests phase to extend a test timeout.

Change-Id: I82e2a59bb74bd2c68ccd2397601b0289f47bdbfe

patch browse .tar.gz

1 files changed, 7 insertions(+), 1 deletions(-)

M gnu/packages/virtualization.scm

M gnu/packages/virtualization.scm => gnu/packages/virtualization.scm +7 -1

@@ 228,7 228,8 @@
       ;; <https://bugs.gnu.org/40527>.
       #:tests? (or (%current-target-system)
                    (not (string=? "i686-linux" (%current-system))))
-      #:parallel-tests? (not (target-arm32?))
+      #:parallel-tests? (not (or (target-arm32?)
+                                 (target-riscv64?)))
       #:configure-flags
       #~(let ((gcc (search-input-file %build-inputs "/bin/gcc"))
               (openbios (search-input-file %build-inputs


@@ 362,6 363,11 @@
               ((target-riscv64?)
                #~((add-after 'unpack 'disable-some-tests
                     (lambda _
+                      ;; Extend the test timeout for this test:
+                      (substitute* "tests/unit/meson.build"
+                        (("test-crypto-tlssession': 90")
+                         "test-crypto-tlssession': 180"))
+
                       ;; qemu.qmp.QMPConnectError:
                       ;; Unexpected empty reply from server
                       (delete-file "tests/qemu-iotests/040")