Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ldb/, sys-libs/ldb/files/
Date: Wed, 02 Feb 2022 08:58:12
Message-Id: 1643792271.9ce42c49ec9b3b1f8273972e98248a3d0bfa1e13.soap@gentoo
1 commit: 9ce42c49ec9b3b1f8273972e98248a3d0bfa1e13
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 2 08:57:51 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 2 08:57:51 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ce42c49
7
8 sys-libs/ldb: disable tests sensitive to 32-bit time_t
9
10 Bug: https://bugs.gentoo.org/832257
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 .../files/ldb-2.4.2-skip-32bit-time_t-tests.patch | 37 ++++++++++++++++++++++
14 sys-libs/ldb/ldb-2.4.2.ebuild | 1 +
15 sys-libs/ldb/ldb-2.5.0.ebuild | 1 +
16 3 files changed, 39 insertions(+)
17
18 diff --git a/sys-libs/ldb/files/ldb-2.4.2-skip-32bit-time_t-tests.patch b/sys-libs/ldb/files/ldb-2.4.2-skip-32bit-time_t-tests.patch
19 new file mode 100644
20 index 000000000000..044f2e29609f
21 --- /dev/null
22 +++ b/sys-libs/ldb/files/ldb-2.4.2-skip-32bit-time_t-tests.patch
23 @@ -0,0 +1,37 @@
24 +From 38f5e8e09a7ae641b3669068b10c6bd966e46632 Mon Sep 17 00:00:00 2001
25 +From: Mathieu Parent <math.parent@×××××.com>
26 +Date: Thu, 4 Nov 2021 22:46:15 +0100
27 +Subject: [PATCH] Skip failing tests (on 32-bit architectures)
28 +
29 +See https://bugzilla.samba.org/show_bug.cgi?id=14558#c17
30 +---
31 + tests/python/api.py | 6 ++++++
32 + 1 file changed, 6 insertions(+)
33 +
34 +diff --git a/tests/python/api.py b/tests/python/api.py
35 +index 8d154aa..e1de40c 100755
36 +--- a/tests/python/api.py
37 ++++ b/tests/python/api.py
38 +@@ -44,6 +44,9 @@ class NoContextTests(TestCase):
39 + self.assertEqual("19700101000000.0Z", ldb.timestring(0))
40 + self.assertEqual("20071119191012.0Z", ldb.timestring(1195499412))
41 +
42 ++ if os.environ.get('DEB_HOST_ARCH_BITS', '64') == '32':
43 ++ self.skipTest('Test failing on 32-bit')
44 ++
45 + self.assertEqual("00000101000000.0Z", ldb.timestring(-62167219200))
46 + self.assertEqual("99991231235959.0Z", ldb.timestring(253402300799))
47 +
48 +@@ -62,6 +65,9 @@ class NoContextTests(TestCase):
49 + self.assertEqual(0, ldb.string_to_time("19700101000000.0Z"))
50 + self.assertEqual(1195499412, ldb.string_to_time("20071119191012.0Z"))
51 +
52 ++ if os.environ.get('DEB_HOST_ARCH_BITS', '64') == '32':
53 ++ self.skipTest('Test failing on 32-bit')
54 ++
55 + self.assertEqual(-62167219200, ldb.string_to_time("00000101000000.0Z"))
56 + self.assertEqual(253402300799, ldb.string_to_time("99991231235959.0Z"))
57 +
58 +--
59 +2.30.2
60 +
61
62 diff --git a/sys-libs/ldb/ldb-2.4.2.ebuild b/sys-libs/ldb/ldb-2.4.2.ebuild
63 index cd109691c887..a8af63199f6d 100644
64 --- a/sys-libs/ldb/ldb-2.4.2.ebuild
65 +++ b/sys-libs/ldb/ldb-2.4.2.ebuild
66 @@ -53,6 +53,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
67 PATCHES=(
68 "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
69 "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
70 + "${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
71 )
72
73 pkg_setup() {
74
75 diff --git a/sys-libs/ldb/ldb-2.5.0.ebuild b/sys-libs/ldb/ldb-2.5.0.ebuild
76 index c435347c1a38..dd87ed506eac 100644
77 --- a/sys-libs/ldb/ldb-2.5.0.ebuild
78 +++ b/sys-libs/ldb/ldb-2.5.0.ebuild
79 @@ -53,6 +53,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
80 PATCHES=(
81 "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
82 "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
83 + "${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
84 )
85
86 pkg_setup() {