civodul pushed a commit to branch master
in repository guix.
commit caf5869a1d88bb4a40705916b120cc31f25ccd09
Author: Ludovic Courtès <l...@gnu.org>
AuthorDate: Sat Mar 15 19:28:44 2025 +0100
tests: Make ‘operating-system-with-console-syslog’ public.
* gnu/tests/install.scm (operating-system-with-console-syslog): Move to…
* gnu/tests.scm (operating-system-with-console-syslog): … here. New
procedure.
Reviewed-by: Maxim Cournoyer <maxim.courno...@gmail.com>
Change-Id: I015e24525140365d09f22127d366107fdc9ca902
---
gnu/tests.scm | 21 +++++++++++++++++++++
gnu/tests/install.scm | 20 --------------------
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/gnu/tests.scm b/gnu/tests.scm
index 84298de448..abb7076208 100644
--- a/gnu/tests.scm
+++ b/gnu/tests.scm
@@ -53,6 +53,7 @@
%simple-os
simple-operating-system
+ operating-system-with-console-syslog
system-test
system-test?
@@ -268,6 +269,26 @@ the system under test."
(services (cons* user-services ... %base-services))))
+(define (operating-system-with-console-syslog os)
+ "Return OS with a system log service that writes to /dev/console."
+ (operating-system
+ (inherit os)
+ (services
+ (modify-services (operating-system-user-services os)
+ (shepherd-system-log-service-type
+ config
+ =>
+ (system-log-configuration
+ (inherit config)
+ (message-destination
+ #~(lambda (message)
+ (let ((destinations ((default-message-destination-procedure)
+ message)))
+ (if (<= (system-log-message-priority message)
+ (system-log-priority info))
+ (cons "/dev/console" destinations)
+ destinations))))))))))
+
;;;
;;; Tests.
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index a837637b18..8293296339 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -1784,26 +1784,6 @@ build (current-guix) and then store a couple of full
system images.")
;;; Installation through the graphical interface.
;;;
-(define (operating-system-with-console-syslog os)
- "Return OS with a syslog service that writes to /dev/console."
- (operating-system
- (inherit os)
- (services
- (modify-services (operating-system-user-services os)
- (shepherd-system-log-service-type
- config
- =>
- (system-log-configuration
- (inherit config)
- (message-destination
- #~(lambda (message)
- (let ((destinations ((default-message-destination-procedure)
- message)))
- (if (<= (system-log-message-priority message)
- (system-log-priority info))
- (cons "/dev/console" destinations)
- destinations))))))))))
-
(define %root-password "foo")
(define* (gui-test-program marionette
