diff options
-rw-r--r-- | main/ldb/APKBUILD | 26 | ||||
-rw-r--r-- | main/ldb/disable-failing-test-ppc64le.patch | 12 |
2 files changed, 3 insertions, 35 deletions
diff --git a/main/ldb/APKBUILD b/main/ldb/APKBUILD index b65b69f224d..8d6236679b1 100644 --- a/main/ldb/APKBUILD +++ b/main/ldb/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ldb -pkgver=2.1.4 +pkgver=2.2.0 pkgrel=0 pkgdesc="A schema-less, ldap like, API and database" url="https://ldb.samba.org/" @@ -11,7 +11,6 @@ makedepends="libtirpc-dev tevent-dev py3-tevent tdb-dev py3-tdb talloc-dev subpackages="$pkgname-dev py3-$pkgname:_py3 $pkgname-tools $pkgname-doc" source="https://www.samba.org/ftp/pub/ldb/ldb-$pkgver.tar.gz disable-compile-error-test.patch - disable-failing-test-ppc64le.patch " # secfixes: @@ -24,24 +23,6 @@ case "$CARCH" in ppc64le) options="$options !check" ;; esac -prepare() { - default_prepare - - # [ RUN ] test_get_size - # [ FAILED ] test_get_size - # [==========] 13 test(s) run. - # [ ERROR ] --- 13369 is not within the range 2500-5000 - # [ LINE ] --- ../../tests/ldb_kv_ops_test.c:1721: error: Failure! - if [ $CARCH = ppc64le ]; then - msg "Patching test_get_size in tests/ldb_kv_opts_test.c" - sed -e 's/5000/15000/' -i tests/ldb_kv_ops_test.c - - msg "Disabling one assertion in tests/python/repack.py" - sed -e '/test_guid_indexed_v1_db/,+18{/toggle_guidindex_check_pack/d}' \ - -i tests/python/repack.py - fi -} - build() { "$_waf" configure \ --prefix=/usr \ @@ -76,6 +57,5 @@ tools() { mv "$pkgdir"/usr/lib/ldb/libldb-cmdline.* "$subpkgdir"/usr/lib/ldb/ } -sha512sums="7e0eecccc973881dde2390568dc71a2ffe7c7ed894daaa9cadf80c221e1b969fd9a8729f3c48a0f611a64b2941c295a2bc7bd8ba869881ba14f75b8bf331167e ldb-2.1.4.tar.gz -ed55d5151bbcaf5c0a1b70a1f44b461a501ad94ce02ee97e3ea10c560ce3656a190510697bbd3c5b6f70a74519bf7c0a91210bcb415ffd97d9440045e10a02e8 disable-compile-error-test.patch -ac50c60082bd761b462f32f949cd6b3bacfd354b3f5dae8bd8655aaa3589e09d6146c42e2edc7c76ca9badd5beec69b5c87cee7cc10e50655cd5c4befd3e4208 disable-failing-test-ppc64le.patch" +sha512sums="3814078a51d2110eeda291ac859c0027df88475812bd6b5f2ce8f8f50aba9c84faced97c37aa1f45e406783a8df97c60ae778df897bb0e89ba3ac8568acced69 ldb-2.2.0.tar.gz +ed55d5151bbcaf5c0a1b70a1f44b461a501ad94ce02ee97e3ea10c560ce3656a190510697bbd3c5b6f70a74519bf7c0a91210bcb415ffd97d9440045e10a02e8 disable-compile-error-test.patch" diff --git a/main/ldb/disable-failing-test-ppc64le.patch b/main/ldb/disable-failing-test-ppc64le.patch deleted file mode 100644 index 61202ad363c..00000000000 --- a/main/ldb/disable-failing-test-ppc64le.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tests/python/repack.py b/tests/python/repack.py -index 0844cd2..189789e 100644 ---- a/tests/python/repack.py -+++ b/tests/python/repack.py -@@ -194,7 +194,6 @@ class GUIDIndexAndPackFormatTests(TestCase): - self.assertEqual(pack_formats, [ldb.PACKING_FORMAT_V2]) - self.assertEqual(self.get_database(), expect_db) - -- self.toggle_guidindex_check_pack() - - - if __name__ == '__main__': |