Disable tests on ppc64le and x86 due to brew limitation

This commit is contained in:
Pavel Zhukov 2021-01-19 10:12:19 +01:00
parent fa19a04ad0
commit 27134fa129
1 changed files with 15 additions and 7 deletions

View File

@ -87,7 +87,10 @@ BuildRequires: groff libtool pkgconfig rsync systemd transfig
BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker) BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker)
BuildRequires: perl(Pod::Html) BuildRequires: perl(Pod::Html)
BuildRequires: CUnit-devel clamav-devel cyrus-sasl-devel glib2-devel %if 0%{?fedora} && 0%{?fedora} >= 0
BuildRequires: clamav-devel
%endif
BuildRequires: CUnit-devel cyrus-sasl-devel glib2-devel
BuildRequires: jansson-devel krb5-devel libical-devel libicu-devel BuildRequires: jansson-devel krb5-devel libical-devel libicu-devel
BuildRequires: libnghttp2-devel libxml2-devel mariadb-devel net-snmp-devel BuildRequires: libnghttp2-devel libxml2-devel mariadb-devel net-snmp-devel
BuildRequires: openldap-devel openssl-devel libpq-devel shapelib-devel BuildRequires: openldap-devel openssl-devel libpq-devel shapelib-devel
@ -127,9 +130,11 @@ BuildRequires: perl(Test::Unit::TestCase) perl(Test::Unit::TestRunner)
BuildRequires: perl(Time::HiRes) perl(URI) perl(URI::Escape) perl(User::pwent) BuildRequires: perl(Time::HiRes) perl(URI) perl(URI::Escape) perl(User::pwent)
BuildRequires: perl(utf8) perl(vars) perl(warnings) perl(XML::DOM) BuildRequires: perl(utf8) perl(vars) perl(warnings) perl(XML::DOM)
BuildRequires: perl(XML::Generator) perl(XML::Spice) BuildRequires: perl(XML::Generator) perl(XML::Spice)
BuildRequires: clamav-data perl(Unix::Syslog) %if 0%{?fedora} && 0%{?fedora} >= 0
BuildRequires: clamav-data
%endif
BuildRequires: perl(HTTP::Daemon) perl(DBI) perl(Net::LDAP::Constant) BuildRequires: perl(HTTP::Daemon) perl(DBI) perl(Net::LDAP::Constant)
BuildRequires: perl(Net::LDAP::Server) BuildRequires: perl(Net::LDAP::Server) perl(Unix::Syslog)
# These were only for JMAP-Tester # These were only for JMAP-Tester
# perl(Moo), perl(Moose), perl(MooseX::Role::Parameterized) perl(Throwable), perl(Safe::Isa) # perl(Moo), perl(Moose), perl(MooseX::Role::Parameterized) perl(Throwable), perl(Safe::Isa)
@ -302,7 +307,6 @@ autoreconf -vi
--disable-silent-rules \ --disable-silent-rules \
\ \
--libexecdir=%cyrexecdir \ --libexecdir=%cyrexecdir \
--with-clamav \
--with-extraident="%release Fedora" \ --with-extraident="%release Fedora" \
--with-krbimpl=mit \ --with-krbimpl=mit \
--with-ldap=/usr \ --with-ldap=/usr \
@ -311,6 +315,11 @@ autoreconf -vi
--with-pgsql \ --with-pgsql \
--with-perl=%__perl \ --with-perl=%__perl \
--with-snmp \ --with-snmp \
%if 0%{?fedora} && 0%{?fedora} >= 0
--with-clamav \
%else
--without-clamav \
%endif
--with-syslogfacility=MAIL \ --with-syslogfacility=MAIL \
\ \
--enable-autocreate \ --enable-autocreate \
@ -472,7 +481,7 @@ chmod -x %buildroot/%perl_vendorlib/Cyrus/Annotator/Daemon.pm
%check %check
## FIXME RHELBLD-4341 ## FIXME RHELBLD-4341
%ifnarch %{ix86} %ifnarch %{ix86} ppc64le
export LD_LIBRARY_PATH=%buildroot/%_libdir export LD_LIBRARY_PATH=%buildroot/%_libdir
export CYRUS_USER=$USER export CYRUS_USER=$USER
@ -539,7 +548,6 @@ tests=(
## FIXME failed on 3.2 only ## FIXME failed on 3.2 only
Rename.intermediate_cleanup Rename.intermediate_cleanup
) )
for i in ${tests[@]}; do exclude+=("!$i"); done for i in ${tests[@]}; do exclude+=("!$i"); done
@ -688,7 +696,7 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
%changelog %changelog
- Fri Jan 15 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-4 - Fri Jan 15 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-4
- Disable tests on ix86 (RHELBLD-4341) - Disable tests on ix86 (RHELBLD-4341) and ppc64le
* Mon Dec 14 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-3 * Mon Dec 14 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-3
- Add ExecReload to service file (#1907223) - Add ExecReload to service file (#1907223)