diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2024-04-30 21:01:12 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2024-05-27 10:26:24 +0300 |
| commit | 4c39f6edebd2a3601c7b75adaf0426c72246b011 (patch) | |
| tree | fc2953a82149e2cd9e642fdc93cc8134c6a2bdde /gnu | |
| parent | 3444a78e2e6d9bd213120e6360a41109d263f118 (diff) | |
| download | guix-4c39f6edebd2a3601c7b75adaf0426c72246b011.tar.gz guix-4c39f6edebd2a3601c7b75adaf0426c72246b011.zip | |
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
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/tests/install.scm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 90e1ca6e75..36dbd9111f 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -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") |