diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-13 16:29:21 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-13 16:29:21 -0500 |
| commit | 6dffced09ecda024e0884e352778c221ad066fd6 (patch) | |
| tree | 1707e8d8df4d9c47317a39ab6abbfc2ca66a6c29 /gnu/tests/virtualization.scm | |
| parent | b603554ed044638dd40b6863d5dada59eefe03b8 (diff) | |
| parent | e3196755e60ba7f1ed9d432e73f26a85e0c8893c (diff) | |
| download | guix-6dffced09ecda024e0884e352778c221ad066fd6.tar.gz | |
Merge branch 'core-updates-frozen' into 'master'.
At last!
Diffstat (limited to 'gnu/tests/virtualization.scm')
| -rw-r--r-- | gnu/tests/virtualization.scm | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index 9f9d3a5e26..628cd0549b 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 <mail@cbaines.net> -;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com> ;;; @@ -73,9 +73,7 @@ (define marionette (make-marionette (list #$vm))) - (mkdir #$output) - (chdir #$output) - + (test-runner-current (system-test-runner #$output)) (test-begin "libvirt") (test-assert "service running" @@ -107,8 +105,7 @@ "-c" "qemu:///system" "connect")) marionette)) - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (test-end)))) (gexp->derivation "libvirt-test" test)) @@ -193,9 +190,7 @@ (define marionette (make-marionette (list #$vm))) - (mkdir #$output) - (chdir #$output) - + (test-runner-current (system-test-runner #$output)) (test-begin "childhurd") (test-assert "service running" @@ -250,8 +245,7 @@ (open-input-pipe #$run-uname-over-ssh))) marionette)) - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (test-end)))) (gexp->derivation "childhurd-test" test)) |