guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 4c51a8c1eaaa31cd09ab74c378c3ddd2256463c7
Author: Noé Lopez <[email protected]>
AuthorDate: Sun May 31 22:21:35 2026 +0200
gnu: umockdev: Update to 0.19.7.
This update is to fix a softlock that happens sometimes in the gnome-shell
test suite. See <https://github.com/martinpitt/umockdev/pull/280>. Thanks
Daniel van Vugt!
It also happened that replacing the whole test suite with a “return 0;” does
not just disable the one test that fails, so I restored that as well.
* gnu/packages/check.scm (umockdev): Update to 0.19.7.
[source]: Add patch to disable a test.
[outputs]: Add debug output.
[arguments]<#:phases>: Remove useless phase. Restore tests.
* gnu/packages/patches/umockdev-disable-tests.patch: New file.
* gnu/local.mk: Register it.
Change-Id: I6a8c8559fa0fd96a1c6151e57619e348169e0062
Signed-off-by: Noé Lopez <[email protected]>
---
gnu/local.mk | 1 +
gnu/packages/check.scm | 19 ++++-----------
gnu/packages/patches/umockdev-disable-tests.patch | 28 +++++++++++++++++++++++
3 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index df56978e8d..568f4d7a5c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2603,6 +2603,7 @@ dist_patch_DATA =
\
%D%/packages/patches/ucx-tcp-iface-ioctl.patch \
%D%/packages/patches/uftrace-fix-tests.patch \
%D%/packages/patches/ultrastar-deluxe-no-freesans.patch \
+ %D%/packages/patches/umockdev-disable-tests.patch \
%D%/packages/patches/unity-test-set-subdir-correctly.patch \
%D%/packages/patches/unity-test-support-int64.patch \
%D%/packages/patches/ungoogled-chromium-custom-compiler.patch \
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 1474c1d54f..f75cc7c03d 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -3480,7 +3480,7 @@ pre-condition.")
(define-public umockdev
(package
(name "umockdev")
- (version "0.19.1")
+ (version "0.19.7")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/martinpitt/umockdev/";
@@ -3488,23 +3488,14 @@ pre-condition.")
"umockdev-" version ".tar.xz"))
(sha256
(base32
- "09plskc0rqwngqssbn2nr8da4zwzkhwg6x5yf109pf36wglf1v1c"))))
+ "0w0845ws7827xbc8xcj24hwp4bq814hz3y3mqna0xg0k34ajxxy8"))
+ (patches
+ (search-patches "umockdev-disable-tests.patch"))))
(build-system meson-build-system)
+ (outputs '("out" "debug"))
(arguments
(list #:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'skip-test-umockdev.c
- ;; This test depends on /sys being available, among other
- ;; things.
- (lambda _
- (call-with-output-file "tests/test-umockdev.c"
- (lambda (port)
- (format port "int main(void) { return 0; }")))))
- ;;
https://github.com/martinpitt/umockdev/issues/228#issuecomment-1968397286
- (add-after 'unpack 'compat-with-meson-1.4
- (lambda _
- (substitute* "meson.build"
- (("-Werror=unused-variable")
"-Wno-error=unused-variable"))))
;; Avoid having to set 'LD_LIBRARY_PATH' to use umockdev
;; via introspection.
(add-after 'unpack 'absolute-introspection-library
diff --git a/gnu/packages/patches/umockdev-disable-tests.patch
b/gnu/packages/patches/umockdev-disable-tests.patch
new file mode 100644
index 0000000000..a046c90985
--- /dev/null
+++ b/gnu/packages/patches/umockdev-disable-tests.patch
@@ -0,0 +1,28 @@
+From a6c53f3af297cb5e48405c0b0b67fbf4e6b06eba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?No=C3=A9=20Lopez?= <[email protected]>
+Date: Sun, 31 May 2026 22:19:16 +0200
+Subject: [PATCH] Disable test that depends on /sys.
+
+/sys is not available in the build environment.
+
+Upstream-Status: Not submitted
+---
+ tests/test-umockdev.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/test-umockdev.c b/tests/test-umockdev.c
+index 623f4ab..304b827 100644
+--- a/tests/test-umockdev.c
++++ b/tests/test-umockdev.c
+@@ -2549,8 +2549,6 @@ main(int argc, char **argv)
+ t_testbed_add_from_string_errors, t_testbed_fixture_teardown);
+ g_test_add("/umockdev-testbed/add_from_file", UMockdevTestbedFixture,
NULL, t_testbed_fixture_setup,
+ t_testbed_add_from_file, t_testbed_fixture_teardown);
+- g_test_add("/umockdev-testbed/libc", UMockdevTestbedFixture, NULL,
t_testbed_fixture_setup,
+- t_testbed_libc, t_testbed_fixture_teardown);
+
+ /* tests for mocking uevents */
+ g_test_add("/umockdev-testbed/uevent/libudev", UMockdevTestbedFixture,
NULL, t_testbed_fixture_setup,
+--
+2.54.0
+
