me
/
guix
Archived
1
0
Fork 0

tests: hurd-vm: Remove custom disk image configuration.

This was added in 18e76f8905.  Presumably,
the problem was that using compressed QCOW2 images makes the childhurd
slower, so it’s eventually marked as failing to start.  By enabling KVM
inside the Guix System VM, we allow the childhurd to run on KVM, which
compensates the slowdown due to the use of a compressed image.

* gnu/tests/virtualization.scm (hurd-vm-disk-image-raw): Remove.
(%childhurd-os): Use default config for ‘hurd-vm-service-type’.
(run-childhurd-test)[test]: Pass “-cpu host” to the run-vm script.
Ludovic Courtès 2023-09-21 12:35:13 +02:00
parent bab6434f58
commit 100d71f8a1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 15 deletions

View File

@ -225,23 +225,10 @@
;;; GNU/Hurd virtual machines, aka. childhurds.
;;;
;; Copy of `hurd-vm-disk-image', using plain disk-image for test
(define (hurd-vm-disk-image-raw config)
(let ((os ((@@ (gnu services virtualization) secret-service-operating-system)
(hurd-vm-configuration-os config)))
(disk-size (hurd-vm-configuration-disk-size config)))
(image
(inherit hurd-disk-image)
(format 'disk-image)
(size disk-size)
(operating-system os))))
(define %childhurd-os
(simple-operating-system
(service dhcp-client-service-type)
(service hurd-vm-service-type
(hurd-vm-configuration
(image (hurd-vm-disk-image-raw this-record))))))
(service hurd-vm-service-type)))
(define (run-childhurd-test)
(define os
@ -292,7 +279,10 @@
(ice-9 match))
(define marionette
(make-marionette (list #$vm)))
;; Emulate the host CPU so that KVM is available inside as well
;; ("nested KVM"), provided
;; /sys/module/kvm_intel/parameters/nested (or similar) allows it.
(make-marionette (list #$vm "-cpu" "host")))
(test-runner-current (system-test-runner #$output))
(test-begin "childhurd")