From patchwork Mon Feb 24 12:45:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 39109 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 55DDC27BBEA; Mon, 24 Feb 2025 12:47:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 171E227BBE9 for ; Mon, 24 Feb 2025 12:47:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmXrl-0002cS-N2; Mon, 24 Feb 2025 07:47:21 -0500 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 1tmXrc-0002SC-Ns for guix-patches@gnu.org; Mon, 24 Feb 2025 07:47:14 -0500 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 1tmXrT-0000nt-C1 for guix-patches@gnu.org; Mon, 24 Feb 2025 07:47:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=iILKr3rtmfSVxNWCCARoYHwHho3h3VPVnc84U5rZlKA=; b=KWg2CiJpWBCTroxLLomkbR6TDwpAkC+jk8a/fvUXwx155SD7Tu9mRDl3GoRiA4dMVTwNqwoaJkYv1Sn0oMxQ2wWVMv61FshSQv7hzcUeWdg9PHxlCWfzhi+Nc3yez47zL1MHATJa8qWzBRPF82m+1V2KO+PMyZ0ELc8jT49cp0T6WF4Z9xCxLNdeH88+a6czf7tEQnsgP8vdiEkk7Xra+VcccXDeCvkghfPXUmPCcaNyOEK7PKXbJRufSTD/NQG05jNe25VjBKytz1AvaYfWjtCU++ejZWt/ZfAerphwQ21I+VQk8+FyFtIqz8Up2FaBNE4G1Pk6VsfLoDL5ZqnpTg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmXrT-00041P-7a for guix-patches@gnu.org; Mon, 24 Feb 2025 07:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76488] [PATCH v2 1/4] tests: Export =?utf-8?b?4oCYbWFyaW9uZXR0?= =?utf-8?b?ZS1wcm9ncmFt4oCZLg==?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Feb 2025 12:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76488@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 76488-submit@debbugs.gnu.org id=B76488.174040120015393 (code B ref 76488); Mon, 24 Feb 2025 12:47:03 +0000 Received: (at 76488) by debbugs.gnu.org; 24 Feb 2025 12:46:40 +0000 Received: from localhost ([127.0.0.1]:38862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmXr5-00040A-5z for submit@debbugs.gnu.org; Mon, 24 Feb 2025 07:46:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33020) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tmXqt-0003z7-7m for 76488@debbugs.gnu.org; Mon, 24 Feb 2025 07:46:28 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tmXqf-0000kb-Vy; Mon, 24 Feb 2025 07:46:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=iILKr3rtmfSVxNWCCARoYHwHho3h3VPVnc84U5rZlKA=; b=P/apxKIYXolJp82bRS1Q g3SAmibAE+MJx2BfJTz+6lZL+iIR5hCC/ujoN1UmPl886vP8ihuBPuiGj2cedivwIMm237ugGGphI pPrfR/WtUNcHvkCDk/k26ldYCI4FhTZPOTBkz552E8sySs+JL6W2GG9XHR3UenqYeZErJ1Sfq1k8S rUMKG6go43km1vjmFd5WQb9d8GR/bcynxssA1z7dFQxnz3ONMMz2u52z8NCIbGO2a8jYOlp74nIOO Eus6jX7qb2Oe9R6VXNMsQ0ifkskBfsO+JVr5JBdWnmsBXvTN0rzdE5BtKx4bgMsNlxnaT9JroLMm/ GIk1hIyWXGEIsg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 24 Feb 2025 13:45:48 +0100 Message-ID: <5d7a1ecb87b871dc98c22be29041361bf543076a.1740400981.git.ludo@gnu.org> X-Mailer: git-send-email 2.48.1 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.scm (%default-marionette-device): New variable. ()[device]: Use it. (marionette-program): Make all parameters optional and export. Change-Id: I496d88253b5ebad60da09a0cca5ed960aa2ab389 --- gnu/tests.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/tests.scm b/gnu/tests.scm index 2a9e51511f0..da0b0146ea7 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016-2020, 2022-2024 Ludovic Courtès +;;; Copyright © 2016-2020, 2022-2025 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2021 Maxime Devos @@ -48,6 +48,7 @@ (define-module (gnu tests) marionette-service-type marionette-operating-system + marionette-program define-os-with-source %simple-os @@ -72,11 +73,15 @@ (define-module (gnu tests) ;;; ;;; Code: +(define %default-marionette-device + ;; Default marionette device in the guest. + "/dev/virtio-ports/org.gnu.guix.port.0") + (define-record-type* marionette-configuration make-marionette-configuration marionette-configuration? (device marionette-configuration-device ;string - (default "/dev/virtio-ports/org.gnu.guix.port.0")) + (default %default-marionette-device)) (imported-modules marionette-configuration-imported-modules (default '())) (extensions marionette-configuration-extensions @@ -92,7 +97,10 @@ (define-syntax-rule (with-imported-modules-and-extensions imported-modules (with-extensions extensions gexp))) -(define (marionette-program device imported-modules extensions) +(define* (marionette-program #:optional + (device %default-marionette-device) + (imported-modules '()) + (extensions '())) "Return the program that runs the marionette REPL on DEVICE. Ensure IMPORTED-MODULES and EXTENSIONS are accessible from the REPL." (define code