Accepting request 484099 from Base:System

- Make it possible to disable tests (for Ring0)
- Add BuildRequires: system-user-daemon for the testsuite (forwarded request 483810 from favogt)

OBS-URL: https://build.opensuse.org/request/show/484099
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/acl?expand=0&rev=41
This commit is contained in:
Ludwig Nussel 2017-04-03 09:04:40 +00:00 committed by Git OBS Bridge
commit 98fda9fe1d
2 changed files with 19 additions and 7 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 29 14:25:36 UTC 2017 - fvogt@suse.com
- Make it possible to disable tests (for Ring0)
- Add BuildRequires: system-user-daemon for the testsuite
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 13 11:06:09 CET 2017 - kukuk@suse.de Mon Mar 13 11:06:09 CET 2017 - kukuk@suse.de

View File

@ -16,6 +16,9 @@
# #
# Ring0 does not have system-user-bin/system-user-daemon
%bcond_without acl_tests
Name: acl Name: acl
%define lname libacl1 %define lname libacl1
Summary: Commands for Manipulating POSIX Access Control Lists Summary: Commands for Manipulating POSIX Access Control Lists
@ -78,8 +81,9 @@ BuildRequires: gettext-tools
BuildRequires: libattr-devel BuildRequires: libattr-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkg-config BuildRequires: pkg-config
%if 0%{?suse_version} > 1320 %if %{with acl_tests} && 0%{?suse_version} > 1320
BuildRequires: system-user-bin BuildRequires: system-user-bin
BuildRequires: system-user-daemon
%endif %endif
#BuildRequires: gpg-offline #BuildRequires: gpg-offline
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -178,12 +182,14 @@ CFLAGS="$RPM_OPT_FLAGS"
%{__make} %{?_smp_mflags} %{__make} %{?_smp_mflags}
%check %check
if ./setfacl -m u:`id -u`:rwx .; then %if %{with acl_tests}
if ./setfacl -m u:`id -u`:rwx .; then
make check || (cat test-suite.log ; false) make check || (cat test-suite.log ; false)
else else
echo '*** ACLs are probably not supported by the file system,' \ echo '*** ACLs are probably not supported by the file system,' \
'the test-suite will NOT run ***' 'the test-suite will NOT run ***'
fi fi
%endif
%install %install
%make_install %make_install