ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: install: Use a default qemu machine for arm architectures.

Browse source 
* gnu/tests/install.scm (qemu-command*): Adjust qemu command when run on
armhf-linux or aarch64-linux to include a machine type.
(run-install): Same.

Change-Id: I32f85183cd8ec39c6a2e66624954743fd5983582
This commit is contained in:
Efraim Flashner 2024-04-30 21:01:12 +03:00
parent 3444a78e2e
commit 4c39f6edeb
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/tests/install.scm
View file

@ -289,6 +289,12 @@ (define install
(define marionette (define marionette
(make-marionette (make-marionette
`(,(which #$(qemu-command system)) `(,(which #$(qemu-command system))
;; Neither of these architectures have a default machine.
,@(if (or (string=? "aarch64-linux" #$system)
(string=? "armhf-linux" #$system))
'("-machine" "virt"
"-cpu" "host")
'())
"-no-reboot" "-no-reboot"
"-m" "1200" "-m" "1200"
,@(if #$uefi-firmware ,@(if #$uefi-firmware
@ -363,6 +369,12 @@ (define* (qemu-command* images #:key (uefi-support? #f) (memory-size 256))
(use-modules (srfi srfi-1)) (use-modules (srfi srfi-1))
`(,(string-append #$qemu-minimal "/bin/" `(,(string-append #$qemu-minimal "/bin/"
#$(qemu-command system)) #$(qemu-command system))
;; Neither of these architectures have a default machine.
,@(if (or (string=? "aarch64-linux" #$system)
(string=? "armhf-linux" #$system))
'("-machine" "virt"
"-cpu" "host")
'())
"-snapshot" ;for the volatile, writable overlay "-snapshot" ;for the volatile, writable overlay
,@(if (file-exists? "/dev/kvm") ,@(if (file-exists? "/dev/kvm")
'("-enable-kvm") '("-enable-kvm")