~ruther/guix-local: tests: install: Use a default qemu machine for arm architectures.

4c39f6edebd2a3601c7b75adaf0426c72246b011 — Efraim Flashner 2 years ago 3444a78

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

* 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

patch browse .tar.gz .zip

1 files changed, 12 insertions(+), 0 deletions(-)

M gnu/tests/install.scm

M gnu/tests/install.scm => gnu/tests/install.scm +12 -0

@@ 289,6 289,12 @@ such as for RAID systems."
             (define marionette
               (make-marionette
                `(,(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"
                  "-m" "1200"
                  ,@(if #$uefi-firmware


@@ 363,6 369,12 @@ MiB of RAM."
                 (use-modules (srfi srfi-1))
                 `(,(string-append #$qemu-minimal "/bin/"
                                   #$(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
                   ,@(if (file-exists? "/dev/kvm")
                         '("-enable-kvm")