diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-09-27 21:14:27 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-27 21:14:27 +0200 |
| commit | 9f1d112d1282216f16b2f673c8213d2839e39b7a (patch) | |
| tree | 890d036d75ae0d38ebff39a4be000959e71409ec /gnu/tests | |
| parent | 859620e51db0b7ffb666cd47146eca4fd4d6ba63 (diff) | |
| parent | cb1e0cfc2f32e6811da588231497d896491ceabb (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/tests')
| -rw-r--r-- | gnu/tests/base.scm | 8 | ||||
| -rw-r--r-- | gnu/tests/install.scm | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 959da31a60..1bc7a70277 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -544,11 +544,11 @@ in a loop. See <http://bugs.gnu.org/26931>.") (>= gid 100)))) ;; Last, the job that uses a command; allows us to test whether - ;; $PATH is sane. (Note that 'marionette-eval' stringifies objects - ;; that don't have a read syntax, hence the string.) + ;; $PATH is sane. (test-equal "root's job with command" - "#<eof>" - (wait-for-file "/root/witness-touch" marionette)) + "" + (wait-for-file "/root/witness-touch" marionette + #:read '(@ (ice-9 rdelim) read-string))) (test-end) (exit (= (test-runner-fail-count (test-runner-current)) 0))))) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 49743860e5..d0cc08f431 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -127,7 +127,11 @@ "Return a variant of OS where ROOTS are registered as GC roots." (operating-system (inherit os) - (services (cons (service gc-root-service-type roots) + + ;; We use this procedure for the installation OS, which already defines GC + ;; roots. Add ROOTS to those. + (services (cons (simple-service 'extra-root + gc-root-service-type roots) (operating-system-user-services os))))) |