summaryrefslogtreecommitdiff
path: root/gnu/tests/linux-modules.scm
diff options
context:
space:
mode:
authorBrice Waegeneire <brice@waegenei.re>2021-05-31 21:44:02 +0200
committerBrice Waegeneire <brice@waegenei.re>2021-05-31 21:57:26 +0200
commit8a0dc5f1bfba4493d2460bf05be9aff200a9bd04 (patch)
tree004b8eb354d9b4be853b807ad08a7d0442295235 /gnu/tests/linux-modules.scm
parenteb8928eebab3c00dc2835564da383639ca3539b7 (diff)
tests: Fix loadable-kernel-modules-service tests.
* gnu/tests/linux-modules.scm (run-loadable-kernel-modules-service-test): Actually load the modules with kernel-module-loader-service-type. Use a singleton service instead of defining a custom one. * doc/guix.texi (Service Reference): To give an example of linux-loadable-module-service-type use a singleton instead of defining a new service.
Diffstat (limited to 'gnu/tests/linux-modules.scm')
-rw-r--r--gnu/tests/linux-modules.scm13
1 files changed, 5 insertions, 8 deletions
diff --git a/gnu/tests/linux-modules.scm b/gnu/tests/linux-modules.scm
index 30d8eae03b8..fc8945b77f2 100644
--- a/gnu/tests/linux-modules.scm
+++ b/gnu/tests/linux-modules.scm
@@ -1,7 +1,7 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> 2;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
3;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org> 3;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
4;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> 4;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re>
5;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com> 5;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com>
6;;; 6;;;
7;;; This file is part of GNU Guix. 7;;; This file is part of GNU Guix.
@@ -112,16 +112,13 @@ are loaded in memory."
112 "Run a test of an OS having MODULE-PACKAGES, which are loaded by creating a 112 "Run a test of an OS having MODULE-PACKAGES, which are loaded by creating a
113service that extends LINUXL-LOADABLE-MODULE-SERVICE-TYPE. Then verify that 113service that extends LINUXL-LOADABLE-MODULE-SERVICE-TYPE. Then verify that
114MODULE-NAMES are loaded in memory." 114MODULE-NAMES are loaded in memory."
115 (define module-installing-service-type
116 (service-type
117 (name 'module-installing-service)
118 (extensions (list (service-extension linux-loadable-module-service-type
119 (const module-packages))))
120 (default-value #f)))
121 (run-loadable-kernel-modules-test-base 115 (run-loadable-kernel-modules-test-base
122 (operating-system 116 (operating-system
123 (inherit (simple-operating-system)) 117 (inherit (simple-operating-system))
124 (services (cons* (service module-installing-service-type) 118 (services (cons* (simple-service 'installing-module
119 linux-loadable-module-service-type
120 module-packages)
121 (service kernel-module-loader-service-type module-names)
125 (operating-system-user-services 122 (operating-system-user-services
126 (simple-operating-system))))) 123 (simple-operating-system)))))
127 module-names)) 124 module-names))