01/01: tests: install: Switch to modifying the gc-root-service-type.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 945a8fc240dbc48e3e4e212ef527eadc70231d39
Author: Ludovic Courtès <address@hidden>
Date:   Tue Sep 26 10:43:10 2017 +0200

    tests: install: Switch to modifying the gc-root-service-type.
    
    Fixes <https://bugs.gnu.org/28600>.
    Fixes a regression introduced in
    4e854b1814a9216ae7cc90aef4d82fd989a519c3.
    Reported by Christopher Baines <address@hidden>.
    
    * gnu/tests/install.scm (operating-system-with-gc-roots): Use
    'simple-service' to extend GC-ROOT-SERVICE-TYPE instead of instantiating
    it.
---
 gnu/tests/install.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 4974386..d0cc08f 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)))))