ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: elogind: Enable tests again.

Browse source 
* gnu/packages/freedesktop.scm (elogind)[arguments]: Remove "-Dtests" from
 #:configure-flags.  Add phase 'adjust-tests'.
This commit is contained in:
Marius Bakke 2020-02-28 18:54:49 +01:00
parent 9f7a441def
commit 20c87138a9
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gnu/packages/freedesktop.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@ -306,7 +306,6 @@ (define-public elogind
"-Dcgroup-controller=elogind"
"-Dman=true"
;; Disable some tests.
"-Dtests=false"
"-Dslow-tests=false"))
#:phases
(modify-phases %standard-phases
@ -324,6 +323,46 @@ (define-public elogind
(("=/run/dbus/system_bus_socket")
"=/var/run/dbus/system_bus_socket"))
#t))
(add-after 'unpack 'adjust-tests
(lambda _
;; This test tries to copy some bytes from /usr/lib/os-release,
;; which does not exist in the build container. Choose something
;; more likely to be available.
(substitute* "src/test/test-copy.c"
(("/usr/lib/os-release")
"/etc/passwd"))
;; Use a shebang that works in the build container.
(substitute* "src/test/test-exec-util.c"
(("#!/bin/sh")
(string-append "#!" (which "sh"))))
;; Do not look for files or directories that do not exist.
(substitute* "src/test/test-fs-util.c"
(("usr") "etc")
(("/etc/machine-id") "/etc/passwd"))
;; FIXME: Why is sd_id128_get_machine_app_specific failing.
;; Disable for now by hooking into the kernel support check.
(substitute* "src/test/test-id128.c"
(("if \\(r == -EOPNOTSUPP\\)")
"if (1)"))
;; This test expects that /sys is available.
(substitute* "src/test/test-mountpoint-util.c"
(("assert_se\\(path_is_mount_point\\(\"/sys.*")
""))
;; /bin/sh does not exist in the build container.
(substitute* "src/test/test-path-util.c"
(("/bin/sh") (which "sh")))
;; This test uses sd_device_new_from_syspath to allocate a
;; loopback device, but that fails because /sys is unavailable.
(substitute* "src/libelogind/sd-device/test-sd-device-thread.c"
((".*sd_device_new_from_syspath.*/sys/class/net/lo.*")
"return 77;"))
;; Most of these tests require cgroups or an actual live
;; logind system so that it can flicker the monitor, etc.
;; Just skip it until a more narrow selection can be made.
(substitute* "src/libelogind/sd-login/test-login.c"
(("r = sd_pid_get_slice.*")
"return 77;"))
#t))
(add-after 'unpack 'change-pid-file-path
(lambda _
(substitute* "src/login/elogind.c"