From a7d28414ccaa3a1e23124def33aa2d97b122310c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 22 Feb 2025 11:09:53 +0100 Subject: [PATCH] =?UTF-8?q?tests:=20Export=20=E2=80=98marionette-program?= =?UTF-8?q?=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 1e3dbf0944..84298de448 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 @@ marionette-service-type marionette-operating-system + marionette-program define-os-with-source %simple-os @@ -72,11 +73,15 @@ ;;; ;;; 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 @@ (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