amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: qemu-minimal: Fix the test suite on armhf-linux.

Browse source 
* gnu/packages/virtualization.scm (qemu)[arguments]: Run the tests
single-threaded on armhf-linux.  Add a phase when building for
armhf-linux to skip a test.

Change-Id: If0f6cdde74c6c67898466f50bf4643ac03dc3661
This commit is contained in:
Efraim Flashner 2025-02-13 10:39:26 +02:00
parent 9eb2468d00
commit f2bbe3fcc7
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/virtualization.scm
View file

@ -236,6 +236,7 @@
;; <https://bugs.gnu.org/40527>. ;; <https://bugs.gnu.org/40527>.
#:tests? (or (%current-target-system) #:tests? (or (%current-target-system)
(not (string=? "i686-linux" (%current-system)))) (not (string=? "i686-linux" (%current-system))))
#:parallel-tests? (not (target-arm32?))
#:configure-flags #:configure-flags
#~(let ((gcc (search-input-file %build-inputs "/bin/gcc")) #~(let ((gcc (search-input-file %build-inputs "/bin/gcc"))
(openbios (search-input-file %build-inputs (openbios (search-input-file %build-inputs
@ -365,8 +366,9 @@
;; This test appears to be flaky as well, probably resulting ;; This test appears to be flaky as well, probably resulting
;; from a race condition. ;; from a race condition.
(delete-file "tests/qemu-iotests/tests/copy-before-write"))) (delete-file "tests/qemu-iotests/tests/copy-before-write")))
#$@(if (target-riscv64?) #$@(cond
'((add-after 'unpack 'disable-some-tests ((target-riscv64?)
#~((add-after 'unpack 'disable-some-tests
(lambda _ (lambda _
;; qemu.qmp.QMPConnectError: ;; qemu.qmp.QMPConnectError:
;; Unexpected empty reply from server ;; Unexpected empty reply from server
@ -379,8 +381,14 @@
(delete-file "tests/qemu-iotests/267") (delete-file "tests/qemu-iotests/267")
;; This test takes too long. ;; This test takes too long.
(delete-file "tests/qemu-iotests/tests/iothreads-stream")))) (delete-file "tests/qemu-iotests/tests/iothreads-stream")))))
'()) ((target-arm32?)
#~((add-after 'unpack 'disable-some-tests
(lambda _
;; failed to allocate memory for stack: Cannot allocate memory
(substitute* "tests/qtest/meson.build"
((".*qtests_aspeed :.*") ""))))))
(else '()))
(add-after 'patch-source-shebangs 'patch-embedded-shebangs (add-after 'patch-source-shebangs 'patch-embedded-shebangs
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
;; Ensure the executables created by these source files reference ;; Ensure the executables created by these source files reference