From 89b05442933d92f4b21c3294455a498e8333727d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 26 Sep 2021 23:20:56 +0200 Subject: tests: Reduce boilerplate for users of 'system-test-runner'. * gnu/tests/audio.scm, gnu/tests/base.scm, gnu/tests/ci.scm, gnu/tests/cups.scm, gnu/tests/databases.scm, gnu/tests/desktop.scm, gnu/tests/dict.scm, gnu/tests/docker.scm, gnu/tests/file-sharing.scm, gnu/tests/ganeti.scm, gnu/tests/guix.scm, gnu/tests/ldap.scm, gnu/tests/linux-modules.scm, gnu/tests/mail.scm, gnu/tests/messaging.scm, gnu/tests/monitoring.scm, gnu/tests/networking.scm, gnu/tests/nfs.scm, gnu/tests/package-management.scm, gnu/tests/reconfigure.scm, gnu/tests/rsync.scm, gnu/tests/security-token.scm, gnu/tests/singularity.scm, gnu/tests/ssh.scm, gnu/tests/telephony.scm, gnu/tests/version-control.scm, gnu/tests/virtualization.scm, gnu/tests/web.scm: Remove (mkdir #$output) (chdir #$output) and pass #$output as argument to 'system-test-runner'. --- gnu/tests/reconfigure.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu/tests/reconfigure.scm') diff --git a/gnu/tests/reconfigure.scm b/gnu/tests/reconfigure.scm index b97fedcf6b..2fd7c6854d 100644 --- a/gnu/tests/reconfigure.scm +++ b/gnu/tests/reconfigure.scm @@ -79,10 +79,7 @@ (define (system-generations marionette) entries))) marionette)) - (mkdir #$output) - (chdir #$output) - - (test-runner-current (system-test-runner)) + (test-runner-current (system-test-runner #$output)) (test-begin "switch-to-system") (let ((generations-prior (system-generations marionette))) @@ -153,10 +150,7 @@ (define (running-services marionette) (map live-service-canonical-name (current-services))) marionette)) - (mkdir #$output) - (chdir #$output) - - (test-runner-current (system-test-runner)) + (test-runner-current (system-test-runner #$output)) (test-begin "upgrade-services") (let ((services-prior (running-services marionette))) @@ -220,10 +214,7 @@ (define (generations-in-grub-cfg marionette) (second (string-split (match:substring parameter) #\=))) (list-matches "system=[^ ]*" grub-cfg)))) - (mkdir #$output) - (chdir #$output) - - (test-runner-current (system-test-runner)) + (test-runner-current (system-test-runner #$output)) (test-begin "install-bootloader") (test-assert "no prior menu entry for system generation" -- cgit v1.2.3