meson: Do not hard-require test dependencies
Signed-off-by: xuxinyu <xuxinyu@xfusion.com>
This commit is contained in:
parent
8bb2db3778
commit
c6d4cfffe2
30
0003-meson-Do-not-hard-require-test-dependencies.patch
Normal file
30
0003-meson-Do-not-hard-require-test-dependencies.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
From ff0aa64e2d9e72d8b54b28cd3615ee3cfe342fdc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Benjamin Berg <bberg@redhat.com>
|
||||||
|
Date: Thu, 5 May 2022 15:54:24 +0200
|
||||||
|
Subject: [PATCH 03/14] meson: Do not hard-require test dependencies
|
||||||
|
|
||||||
|
Just warn about missing test dependencies. If the user tries to run the
|
||||||
|
tests, they will fail. This is fine however, and in certain cases the
|
||||||
|
user might not even want to run the tests.
|
||||||
|
|
||||||
|
Closes: #133
|
||||||
|
---
|
||||||
|
meson.build | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/meson.build b/meson.build
|
||||||
|
index b155a4a..159f0e8 100644
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -153,7 +153,7 @@ python3_available_modules = []
|
||||||
|
|
||||||
|
foreach module, required : python3_test_modules
|
||||||
|
if required and run_command(python3, '-c', 'import @0@'.format(module)).returncode() != 0
|
||||||
|
- error('Python3 module \'' + module + '\' required by test suite not found')
|
||||||
|
+ warning('Python3 module \'' + module + '\' required by test suite not found')
|
||||||
|
endif
|
||||||
|
endforeach
|
||||||
|
|
||||||
|
--
|
||||||
|
2.37.1.windows.1
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: fprintd
|
Name: fprintd
|
||||||
Version: 1.94.2
|
Version: 1.94.2
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: D-Bus service for Fingerprint reader access
|
Summary: D-Bus service for Fingerprint reader access
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -9,6 +9,7 @@ Url: http://www.freedesktop.org/wiki/Software/fprint/fprintd
|
|||||||
ExcludeArch: s390 s390x
|
ExcludeArch: s390 s390x
|
||||||
Patch0001: 0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch
|
Patch0001: 0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch
|
||||||
Patch0002: 0002-tests-Fix-dbusmock-AddDevice-calls-to-include-option.patch
|
Patch0002: 0002-tests-Fix-dbusmock-AddDevice-calls-to-include-option.patch
|
||||||
|
Patch0003: 0003-meson-Do-not-hard-require-test-dependencies.patch
|
||||||
|
|
||||||
BuildRequires: meson
|
BuildRequires: meson
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
@ -95,6 +96,9 @@ fi
|
|||||||
%{_mandir}/man8/pam_fprintd.8.gz
|
%{_mandir}/man8/pam_fprintd.8.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 05 2023 xuxinyu <xuxinyu@xfusion.com> - 1.94.2-4
|
||||||
|
- meson: Do not hard-require test dependencies
|
||||||
|
|
||||||
* Thu Jan 05 2023 xuxinyu <xuxinyu@xfusion.com> - 1.94.2-3
|
* Thu Jan 05 2023 xuxinyu <xuxinyu@xfusion.com> - 1.94.2-3
|
||||||
- tests: Fix dbusmock AddDevice calls to include optional argument
|
- tests: Fix dbusmock AddDevice calls to include optional argument
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user