From af6aa5128dbc118edb7b4b3121f5989e79d4f4f1 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Jun 06 2017 14:32:18 +0000 Subject: Add patch to increate test suite timeout. Sometimes armv7hl is just too slow to complete some of the tests within 20 seconds. Sigh. --- diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index 8b7e8fd..69d1ef5 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -30,8 +30,9 @@ Patch0: patch-cyrus-testsuite-endianness Patch1: patch-cyrus-testsuite-endianness2 Patch2: patch-cyrus-testsuite-endianness3 Patch3: patch-cyrus-testsuite-endianness4 -Patch4: patch-cyrus-autoreconf-keep-version -Patch5: patch-cyrus-fix-endianness-checks +Patch4: patch-cyrus-testsuite-timeout +Patch5: patch-cyrus-autoreconf-keep-version +Patch6: patch-cyrus-fix-endianness-checks Source10: cyrus-imapd.logrotate Source11: cyrus-imapd.pam-config @@ -625,10 +626,13 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v %changelog -* Fri Jun 02 2017 Jason L Tibbitts III - 3.0.1-3 +* Tue Jun 06 2017 Jason L Tibbitts III - 3.0.1-3 - Remove clamav from build requirements. - Add --cleanup to Cassandane call to hopefully reduce build disk usage. - Disable maxforkrate test on s390x; our builders are too slow to run it. +- Use proper path to ctl_mboxlist in cron file. +- Add patch to increase individual test timeout. Sometimes armv7hl can't + complete a single test in 20 seconds. * Fri Jun 02 2017 Jason L Tibbitts III - 3.0.1-2 - Add patch to fix up some endianness issues. diff --git a/patch-cyrus-testsuite-timeout b/patch-cyrus-testsuite-timeout new file mode 100644 index 0000000..74fa4f8 --- /dev/null +++ b/patch-cyrus-testsuite-timeout @@ -0,0 +1,13 @@ +diff --git a/cunit/unit.c b/cunit/unit.c +index 46dc358..ca37f22 100644 +--- a/cunit/unit.c ++++ b/cunit/unit.c +@@ -97,7 +97,7 @@ EXPORTED void fatal(const char *s, int code) + } + + /* Each test gets a maximum of 20 seconds. */ +-#define TEST_TIMEOUT_MS (20*1000) ++#define TEST_TIMEOUT_MS (30*1000) + + static jmp_buf jbuf; + static const char *code;