unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Efraim Flashner <efraim@flashner.co.il>
To: 70913@debbugs.gnu.org
Cc: Efraim Flashner <efraim@flashner.co.il>
Subject: [bug#70913] [PATCH 11/11] tests: install: Use a default qemu machine for arm architectures.
Date: Mon, 13 May 2024 11:22:00 +0300	[thread overview]
Message-ID: <86a554995ba7ef5847407df4f034df06c8b35041.1715588342.git.efraim@flashner.co.il> (raw)
In-Reply-To: <cover.1715588342.git.efraim@flashner.co.il>

* 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 @@ (define* (run-install target-os target-os-source
             (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 @@ (define* (qemu-command* images #:key (uefi-support? #f) (memory-size 256))
                 (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")
-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted





  parent reply	other threads:[~2024-05-13  8:25 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-13  8:19 [bug#70913] [PATCH 00/11] Combine edk2-tools and ovmf firmware Efraim Flashner
2024-05-13  8:21 ` [bug#70913] [PATCH 01/11] gnu: edk2-tools: Update to 202402 Efraim Flashner
2024-05-13  8:21 ` [bug#70913] [PATCH 02/11] gnu: edk2-tools: Enable submodules Efraim Flashner
2024-05-13  8:21 ` [bug#70913] [PATCH 03/11] gnu: Add ovmf-x86-64 Efraim Flashner
2024-05-13  8:21 ` [bug#70913] [PATCH 04/11] gnu: Add ovmf-i686 Efraim Flashner
2024-05-13  8:21 ` [bug#70913] [PATCH 05/11] gnu: ovmf-aarch64: Update to 202402 Efraim Flashner
2024-05-13  8:21 ` [bug#70913] [PATCH 06/11] gnu: ovmf-arm: " Efraim Flashner
2024-05-13  8:21 ` [bug#70913] [PATCH 07/11] gnu: ovmf-riscv64: " Efraim Flashner
2024-05-13  8:21 ` [bug#70913] [PATCH 08/11] gnu: Use new ovmf firmware packages Efraim Flashner
2024-05-13  8:21 ` [bug#70913] [PATCH 09/11] tests: install: Add support for aarch64 UEFI tests Efraim Flashner
2024-05-13  8:21 ` [bug#70913] [PATCH 10/11] gnu: ovmf: Deprecate in favor of ovmf-x86-64 Efraim Flashner
2024-05-13  8:22 ` Efraim Flashner [this message]
     [not found] ` <handler.70913.B.17155884115327.ack@debbugs.gnu.org>
2024-05-27  8:44   ` bug#70913: Acknowledgement ([PATCH 00/11] Combine edk2-tools and ovmf firmware) Efraim Flashner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=86a554995ba7ef5847407df4f034df06c8b35041.1715588342.git.efraim@flashner.co.il \
    --to=efraim@flashner.co.il \
    --cc=70913@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).