diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-21 22:16:02 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-21 22:16:02 +0100 |
commit | d19b14c8349ce8cacb62619ab68953265daeeca7 (patch) | |
tree | 9aacc6f9378ca69951c87232b3a7526fef2f2054 /gnu/tests | |
parent | 680b56116a4840a281a45cb130fd45d6d3d46c56 (diff) | |
parent | ee4c927f33a1d3b01cf36be3c74227f6b7fd69ff (diff) | |
download | guix-patches-d19b14c8349ce8cacb62619ab68953265daeeca7.tar guix-patches-d19b14c8349ce8cacb62619ab68953265daeeca7.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/tests')
-rw-r--r-- | gnu/tests/install.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 9ecc45cc04..4f650ffb34 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -270,8 +270,12 @@ packages defined in installation-os." (lambda (port) (write '#$target-os-source port))) marionette) - (exit (marionette-eval '(zero? (system #$script)) - marionette))) + + ;; Run SCRIPT. It typically invokes 'reboot' as a last step and + ;; thus normally gets killed with SIGTERM by PID 1. + (let ((status (marionette-eval '(system #$script) marionette))) + (exit (or (equal? (status:term-sig status) SIGTERM) + (equal? (status:exit-val status) 0))))) (when #$(->bool gui-test) (wait-for-unix-socket "/var/guix/installer-socket" |