[PATCH 1/1] gnu: libevent: Skip test that fails on 32bit.

[PATCH 1/1] gnu: libevent: Skip test that fails on 32bit.

[Marius Bakke]

* gnu/packages/patches/libevent-2.1-skip-failing-32bit-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/libevent.scm (libevent)[source]: Use it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/libevent.scm                          |  5 ++++-
 .../libevent-2.1-skip-failing-32bit-test.patch     | 22 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/libevent-2.1-skip-failing-32bit-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index da4dbb0d2..cd2c034fc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -676,6 +676,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/libevent-2.0-evdns-fix-searching-empty-hostnames.patch	\
   %D%/packages/patches/libevent-2.0-evutil-fix-buffer-overflow.patch	\
   %D%/packages/patches/libevent-2.1-dns-tests.patch		\
+  %D%/packages/patches/libevent-2.1-skip-failing-32bit-test.patch	\
   %D%/packages/patches/libextractor-ffmpeg-3.patch		\
   %D%/packages/patches/libjxr-fix-function-signature.patch	\
   %D%/packages/patches/libjxr-fix-typos.patch			\
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index ca59db390..9b06ae3e1 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -43,7 +43,10 @@
              (sha256
               (base32
                "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n"))
-             (patches (search-patches "libevent-2.1-dns-tests.patch"))))
+             (patches (search-patches "libevent-2.1-dns-tests.patch"
+                                      ;; XXX: Try removing this for > 2.1.8.
+                                      ;; https://github.com/libevent/libevent/issues/452
+                                      "libevent-2.1-skip-failing-32bit-test.patch"))))
     (build-system gnu-build-system)
     (inputs
      `(("python" ,python-2)))           ; for 'event_rpcgen.py'
diff --git a/gnu/packages/patches/libevent-2.1-skip-failing-32bit-test.patch b/gnu/packages/patches/libevent-2.1-skip-failing-32bit-test.patch
new file mode 100644
index 000000000..aba49ef50
--- /dev/null
+++ b/gnu/packages/patches/libevent-2.1-skip-failing-32bit-test.patch
@@ -0,0 +1,22 @@
+XXX: These fail on 32-bit due to an overflow bug in the test program.
+
+Upstream bug URL:
+
+https://github.com/libevent/libevent/issues/452
+
+diff --git a/test/regress_util.c b/test/regress_util.c
+index ef6a1487..4de501fc 100644
+--- a/test/regress_util.c
++++ b/test/regress_util.c
+@@ -1413,9 +1413,9 @@ static struct date_rfc1123_case {
+ 	{  1323648000, "Mon, 12 Dec 2011 00:00:00 GMT"},
+ #ifndef _WIN32
+ 	/** In win32 case we have max   "23:59:59 January 18, 2038, UTC" for time32 */
+-	{  4294967296, "Sun, 07 Feb 2106 06:28:16 GMT"} /* 2^32 */,
++	//{  4294967296, "Sun, 07 Feb 2106 06:28:16 GMT"} /* 2^32 */,
+ 	/** In win32 case we have max "23:59:59, December 31, 3000, UTC" for time64 */
+-	{253402300799, "Fri, 31 Dec 9999 23:59:59 GMT"} /* long long future no one can imagine */,
++	//{253402300799, "Fri, 31 Dec 9999 23:59:59 GMT"} /* long long future no one can imagine */,
+ 	{  1456704000, "Mon, 29 Feb 2016 00:00:00 GMT"} /* leap year */,
+ #endif
+ 	{  1435708800, "Wed, 01 Jul 2015 00:00:00 GMT"} /* leap second */,
-- 
2.11.0

Re: [PATCH 1/1] gnu: libevent: Skip test that fails on 32bit.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 714 bytes --]

Marius Bakke <mbakke@fastmail.com> writes:

> diff --git a/gnu/packages/patches/libevent-2.1-skip-failing-32bit-test.patch b/gnu/packages/patches/libevent-2.1-skip-failing-32bit-test.patch
> new file mode 100644
> index 000000000..aba49ef50
> --- /dev/null
> +++ b/gnu/packages/patches/libevent-2.1-skip-failing-32bit-test.patch
> @@ -0,0 +1,22 @@
> +XXX: These fail on 32-bit due to an overflow bug in the test program.
> +
> +Upstream bug URL:
> +
> +https://github.com/libevent/libevent/issues/452

The issue is isolated to the test program and not the
evutil_date_rfc1123() implementation itself, which is new in 2.1.

I pushed the patch with an additional comment as
fd05d7ecd9f021b6c52a6d27669188b44305c79d.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]