From f27231a2dc0a7a64a10f1f7c365961671fff88a4 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Thu, 7 Jun 2018 11:01:52 -0500
Subject: [PATCH] Re-exclude maxforkrate test on s390x.

---
 cyrus-imapd.spec | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index c5f2586..938fda6 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -493,6 +493,14 @@ tests=(
 for i in ${tests[@]}; do exclude+=("!$i"); done
 %endif
 
+%ifarch s390x
+# This one test fails occasionally on s390x because the hosts are just too slow
+# to complete it.D  It's testing something valid (that the fork rate limiting
+# settings work properly) but s390x can't fork quickly enough to exceeed the
+# limits it's testing.
+exclude+=("!Master.maxforkrate")
+%endif
+
 # Add -vvv for too much output
 ./testrunner.pl %{?_smp_mflags} -v -f pretty ${exclude[@]} 2>&1
 
@@ -601,9 +609,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 
 
 %changelog
-* Fri Jun 01 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-4
+* Thu Jun 07 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-4
 - Update Cassandane checkout.  Drop upstreamed patch.
 - Patch code for RECONSTRUCT implementation to use the renamed cyr_quota.
+- Re-exclude maxforkrate test on s390x.
 
 * Wed May 30 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-3
 - Remove ldconfig scriptlets.