From fa19a04ad0e697a442097dc2844d5cae4accd40c Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Fri, 15 Jan 2021 07:53:50 +0100 Subject: [PATCH] Disable tests for ix86 Due to brew limitation there's possibility to have both x86 and x86_64 builds running on same host. This causes port conflicts and build failures. Disabling test for less important architecture for now. x86 build should be performed manualy with tests enabled as scratch build if needed. --- cyrus-imapd.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index 92ec601..3c59163 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -14,7 +14,7 @@ Name: cyrus-imapd Version: 3.2.4 -Release: 3%{?dist} +Release: 4%{?dist} %define ssl_pem_file_prefix /etc/pki/%name/%name @@ -471,6 +471,8 @@ chmod -x %buildroot/%perl_vendorlib/Cyrus/Annotator/Daemon.pm %check +## FIXME RHELBLD-4341 +%ifnarch %{ix86} export LD_LIBRARY_PATH=%buildroot/%_libdir export CYRUS_USER=$USER @@ -566,7 +568,7 @@ exclude+=("!Master.maxforkrate") # Add -vvv for too much output ./testrunner.pl %{?_smp_mflags} -v -f pretty ${exclude[@]} 2>&1 - +%endif %pre # Create 'cyrus' user on target host @@ -685,6 +687,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v %changelog +- Fri Jan 15 2021 Pavel Zhukov - 3.2.4-4 +- Disable tests on ix86 (RHELBLD-4341) + * Mon Dec 14 2020 Pavel Zhukov - 3.2.4-3 - Add ExecReload to service file (#1907223)