Compare commits
No commits in common. "7ec83d912cd26f936203017513b85208a0da1344" and "0781e15ac62da8c5b106d7e3ee5661d94189892d" have entirely different histories.
7ec83d912c
...
0781e15ac6
42
fix-test-assertion-with-umockdev.patch
Normal file
42
fix-test-assertion-with-umockdev.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
From bf8664a028d8cbc55f9dbc65fef926e2119b9579 Mon Sep 17 00:00:00 2001
|
||||||
|
From: James Clarke <jrtc27@jrtc27.com>
|
||||||
|
Date: Tue, 23 Jan 2018 21:03:51 +0000
|
||||||
|
Subject: tests: Fix test assertion with umockdev
|
||||||
|
|
||||||
|
Since 0.9.4, rather than checking for libumockdev-preload being in
|
||||||
|
LD_PRELOAD, umockdev_in_mock_environment now checks whether /sys is
|
||||||
|
being redirected. This only occurs when $UMOCKDEV_DIR is set, which
|
||||||
|
happens inside umockdev_testbed_new, so the assertion must come after
|
||||||
|
this call.
|
||||||
|
|
||||||
|
https://bugzilla.gnome.org/show_bug.cgi?id=792845
|
||||||
|
---
|
||||||
|
tests/test-enumerator-filter.c | 5 +++--
|
||||||
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tests/test-enumerator-filter.c b/tests/test-enumerator-filter.c
|
||||||
|
index 9c97903..dfcdba2 100644
|
||||||
|
--- a/tests/test-enumerator-filter.c
|
||||||
|
+++ b/tests/test-enumerator-filter.c
|
||||||
|
@@ -37,6 +37,9 @@ test_enumerator_filter (void)
|
||||||
|
/* create test bed */
|
||||||
|
UMockdevTestbed *testbed = umockdev_testbed_new ();
|
||||||
|
|
||||||
|
+ /* Relies on a test bed having been set up */
|
||||||
|
+ g_assert (umockdev_in_mock_environment ());
|
||||||
|
+
|
||||||
|
/* Add 2 devices in the USB subsystem, and one in the DRM subsystem */
|
||||||
|
umockdev_testbed_add_device (testbed, "usb", "dev1", NULL,
|
||||||
|
"idVendor", "0815", "idProduct", "AFFE", NULL,
|
||||||
|
@@ -74,8 +77,6 @@ int main(int argc, char **argv)
|
||||||
|
setlocale (LC_ALL, NULL);
|
||||||
|
g_test_init (&argc, &argv, NULL);
|
||||||
|
|
||||||
|
- g_assert (umockdev_in_mock_environment ());
|
||||||
|
-
|
||||||
|
g_test_add_func ("/gudev/enumerator_filter", test_enumerator_filter);
|
||||||
|
|
||||||
|
return g_test_run ();
|
||||||
|
--
|
||||||
|
cgit v0.12
|
||||||
|
|
||||||
BIN
libgudev-232.tar.xz
Normal file
BIN
libgudev-232.tar.xz
Normal file
Binary file not shown.
Binary file not shown.
@ -1,15 +1,15 @@
|
|||||||
Name: libgudev
|
Name: libgudev
|
||||||
Version: 237
|
Version: 232
|
||||||
Release: 2
|
Release: 7
|
||||||
Summary: Library that provides GObject bindings for libudev
|
Summary: Library that provides GObject bindings for libudev
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://wiki.gnome.org/Projects/libgudev
|
URL: https://wiki.gnome.org/Projects/libgudev
|
||||||
Source0: https://download.gnome.org/sources/libgudev/%{version}/%{name}-%{version}.tar.xz
|
Source0: https://download.gnome.org/sources/libgudev/%{version}/%{name}-%{version}.tar.xz
|
||||||
|
Patch1: fix-test-assertion-with-umockdev.patch
|
||||||
|
|
||||||
BuildRequires: glib2-devel umockdev-devel gobject-introspection-devel pkgconfig libudev-devel gtk-doc
|
BuildRequires: glib2-devel umockdev-devel gobject-introspection-devel pkgconfig libudev-devel gtk-doc libxslt
|
||||||
BuildRequires: meson glibc-langpack-fr
|
|
||||||
Provides: libgudev1 = %{version}-%{release}
|
Provides: libgudev1 = %{version}-%{release}
|
||||||
Obsoletes: libgudev1 < 230
|
Obsoletes: libgudev1 < %{version}-%{release}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Library provides GObject bindings for libudev. It used to be part
|
Library provides GObject bindings for libudev. It used to be part
|
||||||
@ -19,7 +19,7 @@ of udev, then merged into systemd. It's now a project on its own.
|
|||||||
Summary: Include files and Header files for %{name}
|
Summary: Include files and Header files for %{name}
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Provides: libgudev1-devel = %{version}-%{release}
|
Provides: libgudev1-devel = %{version}-%{release}
|
||||||
Obsoletes: libgudev1-devel < 230
|
Obsoletes: libgudev1-devel < %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
The %{name}-devel package contains libraries and header files for
|
The %{name}-devel package contains libraries and header files for
|
||||||
@ -31,15 +31,15 @@ developing applications that use %{name}.
|
|||||||
%autosetup -n %{name}-%{version} -p1
|
%autosetup -n %{name}-%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%meson -Dgtk_doc=true -Dtests=enabled -Dvapi=disabled
|
%configure --enable-gtk-doc
|
||||||
%meson_build
|
%make_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%meson_install
|
%make_install
|
||||||
|
%delete_la
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
make check
|
||||||
%meson_test
|
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
@ -62,24 +62,6 @@ developing applications that use %{name}.
|
|||||||
%{_datadir}/gtk-doc/html/gudev/*
|
%{_datadir}/gtk-doc/html/gudev/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Oct 25 2022 wangkerong <wangkerong@h-partners.com> - 237-2
|
|
||||||
- rebuild for next release
|
|
||||||
|
|
||||||
* Sat Dec 4 2021 xingxing <xingxing@huawei.com> - 237-1
|
|
||||||
- updtae to 237
|
|
||||||
|
|
||||||
* Wed Jan 27 2021 hanhui <hanhui15@huawei.com> - 234-1
|
|
||||||
- Type: enhancement
|
|
||||||
- ID: NA
|
|
||||||
- SUG: NA
|
|
||||||
- DESC: update to 234
|
|
||||||
|
|
||||||
* Fri Jan 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 233-1
|
|
||||||
- Type:bugfix
|
|
||||||
- Id:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC:updtae to 233
|
|
||||||
|
|
||||||
* Wed Dec 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 232-7
|
* Wed Dec 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 232-7
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
@ -1,4 +0,0 @@
|
|||||||
version_control: gitlab.gnome
|
|
||||||
src_repo: libgudev
|
|
||||||
tag_prefix: ^v
|
|
||||||
seperator: "."
|
|
||||||
Loading…
x
Reference in New Issue
Block a user