From patchwork Mon May 13 08:22:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 27429 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5266727BBE9; Mon, 13 May 2024 09:25:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5986427BBE2 for ; Mon, 13 May 2024 09:25:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qzk-0003VP-3M; Mon, 13 May 2024 04:25:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6QzZ-0003Tj-RT for guix-patches@gnu.org; Mon, 13 May 2024 04:25:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s6QzY-0001UW-W8 for guix-patches@gnu.org; Mon, 13 May 2024 04:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6QzZ-0001WX-A7 for guix-patches@gnu.org; Mon, 13 May 2024 04:25:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 11/11] tests: install: Use a default qemu machine for arm architectures. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:25:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70913 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70913@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886795770 (code B ref 70913); Mon, 13 May 2024 08:25:05 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:24:39 +0000 Received: from localhost ([127.0.0.1]:59444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qyu-0001Ut-8a for submit@debbugs.gnu.org; Mon, 13 May 2024 04:24:39 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:42193) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qyb-0001SV-MZ for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:24:08 -0400 Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-34d7b0dac54so2228098f8f.0 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588579; x=1716193379; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=TqxFDHaA5joWfgfcfaw4+JVzhrp30766OLk8EqVje04=; b=NYkcrvZZ0lDK/tH1Ph1sh2I4lXTLtfC2j4RKz/qILwVgDNhbUyaMcFtM1h6gLjVEUq eu95kdMdrc08t5bCadmu+gu5LHhyGQooXZCUMeVUFW7QxTfA5y9bS90Z+BIOmQ0ecQ+v kXZ5FAi4n+Ao1BRREdDmIM4jhnfH8gmyqqVHW7NHvD42t1q8QHzvBQ7UTubDZeVO9ejY UnS/Blj5usv4rv04k5hOOOExqlnlsi6NR1Sn5V0HCle1knDQnOwkuj6Q1jC0LUsDvFJY Qs5a3Dt813qn+p9TNdfYJICgV34q48CP4a7YPhaS1Iifjv+Q6HUSwMLTd6PKrNqijAVO pB3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588579; x=1716193379; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TqxFDHaA5joWfgfcfaw4+JVzhrp30766OLk8EqVje04=; b=xGbiAeAsx4KBiAPQmih0FLph9JocDMCeCQAA+hP/mV2GNhvOZC4bBN6YyRtPxnQwBJ 6WUiMESaKk07yebmLpUJzAq/IkpkuwNLWY1fSYmI8yNC3x9IMGKN4ZfebDkQJegt1nkF 5LLY+vcYpFErFTv/XUlt2U6w3XPe3KSAvFBV/n7WuEWHYM5GSBHzypHAva9AUoXAQT6V DC0U/3L6CmjP+O8w93PyM25hHH8whHpc2QJHrD72cPnM5oLHvwVILnL96LVC7Mx34c50 Q+ZPJSUKVxywSETuiGUqEi1YSJ7n32iq8iaLSd81+G2IL1lfprNM3nwmPscy0ckPTprH 1OFg== X-Gm-Message-State: AOJu0YxKcrubxcWLtPSQrLsCfnFFpa8rcG7MXvJ+/loMI/4J3M+/m96U 6nxYJy/IIDUhGlcvheezBNSLHsH4H7SoYqkVFbkxgKcdt0QnzUDbPRS7BWhP X-Google-Smtp-Source: AGHT+IHOcydUGaKOe3+QWzRgdQTyONG6Nfzj2+I5+QADLytngRyzkBUBJfDXvmGWKOIWkZCjvVkzfA== X-Received: by 2002:adf:cc08:0:b0:343:cee1:cbc1 with SMTP id ffacd0b85a97d-350181150b2mr10545875f8f.14.1715588579480; Mon, 13 May 2024 01:22:59 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502baad04dsm10501167f8f.81.2024.05.13.01.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:59 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:22:00 +0300 Message-ID: <86a554995ba7ef5847407df4f034df06c8b35041.1715588342.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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")