From 1fc4d821eb3b34e06b217e94f400e13d8030e7b9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 5 Jun 2022 22:30:18 +0200 Subject: tests: childhurd: Generalize command execution over SSH. * gnu/tests/virtualization.scm (run-childhurd-test)[run-uname-over-ssh]: Rename to... [run-command-over-ssh]: ... this. Add 'command' parameter and honor it. ["SSH up and running"]: Adjust accordingly. --- gnu/tests/virtualization.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index 628cd0549b..0453f38e5e 100644 --- a/gnu/tests/virtualization.scm +++ b/gnu/tests/virtualization.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Christopher Baines -;;; Copyright © 2020, 2021 Ludovic Courtès +;;; Copyright © 2020-2022 Ludovic Courtès ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Pierre Langlois ;;; @@ -151,8 +151,8 @@ (operating-system os) (memory-size (* 1024 3)))) - (define run-uname-over-ssh - ;; Program that runs 'uname' over SSH and prints the result on standard + (define (run-command-over-ssh . command) + ;; Program that runs COMMAND over SSH and prints the result on standard ;; output. (let () (define run @@ -173,12 +173,12 @@ (userauth-password! session "") (display (get-string-all - (open-remote-input-pipe* session "uname" "-on")))) + (open-remote-input-pipe* session #$@command)))) (status (error "could not connect to childhurd over SSH" session status))))))) - (program-file "run-uname-over-ssh" run))) + (program-file "run-command-over-ssh" run))) (define test (with-imported-modules '((gnu build marionette)) @@ -242,7 +242,7 @@ (use-modules (ice-9 popen)) (get-string-all - (open-input-pipe #$run-uname-over-ssh))) + (open-input-pipe #$(run-command-over-ssh "uname" "-on")))) marionette)) (test-end)))) -- cgit v1.2.3