[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/12: tests: install: Use a default qemu machine for arm architectures.
From: |
guix-commits |
Subject: |
12/12: tests: install: Use a default qemu machine for arm architectures. |
Date: |
Mon, 27 May 2024 03:27:17 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 4c39f6edebd2a3601c7b75adaf0426c72246b011
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Apr 30 21:01:12 2024 +0300
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
---
gnu/tests/install.scm | 12 ++++++++++++
1 file changed, 12 insertions(+)
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")
- branch master updated (a3e5caa222 -> 4c39f6edeb), guix-commits, 2024/05/27
- 07/12: gnu: ovmf-arm: Update to 202402., guix-commits, 2024/05/27
- 04/12: gnu: Add ovmf-x86-64., guix-commits, 2024/05/27
- 01/12: gnu: e2fsprogs: Downgrade to 1.46.6., guix-commits, 2024/05/27
- 12/12: tests: install: Use a default qemu machine for arm architectures.,
guix-commits <=
- 06/12: gnu: ovmf-aarch64: Update to 202402., guix-commits, 2024/05/27
- 02/12: gnu: edk2-tools: Update to 202402., guix-commits, 2024/05/27
- 03/12: gnu: edk2-tools: Enable submodules., guix-commits, 2024/05/27
- 08/12: gnu: ovmf-riscv64: Update to 202402., guix-commits, 2024/05/27
- 11/12: gnu: ovmf: Deprecate in favor of ovmf-x86-64., guix-commits, 2024/05/27
- 05/12: gnu: Add ovmf-i686., guix-commits, 2024/05/27
- 09/12: gnu: Use new ovmf firmware packages., guix-commits, 2024/05/27
- 10/12: tests: install: Add support for aarch64 UEFI tests., guix-commits, 2024/05/27