From 4e15be0451f0278232ba70595496a4a382965b51 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 21 Apr 2021 13:35:50 +0200 Subject: [PATCH] Fix ldb tests on aarch64 resolves: #1951285 --- fixed-guidindexpackv1.ldb | Bin 0 -> 65536 bytes ldb-2.3.0-fix-tests-on-aarch64.patch | 39 +++++++++++++++++++++++++++ libldb.spec | 13 ++++++++- 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 fixed-guidindexpackv1.ldb create mode 100644 ldb-2.3.0-fix-tests-on-aarch64.patch diff --git a/fixed-guidindexpackv1.ldb b/fixed-guidindexpackv1.ldb new file mode 100644 index 0000000000000000000000000000000000000000..96d783cb0dc2031274113db2aa6ccfc9729fe282 GIT binary patch literal 65536 zcmeI)OK4nG0LJl&?V?m#BR-&RELN%uA9vo9KqQYz>Oh^5%%m2p#ysw{l_pV>P@fxd zA#^8IDijQKW2qpbf(r#9=|UGJ;6|YcLUGert2S-pBYMttX1sUqxxJ4h%U){N~+G#zyv3pA=H@1CRM*sl? z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R&oAK>MdvlaqTR1Q!0@h*oJ60R#|0 z0D<}vxbjzh^@rXd&}af5@*QflA)~(tAb`M{1{D z2P1$00u3#&h4r(c$B)h<5L961O3<3rD+`?Xz5E+L5kLR|1pEkm@tdEko9Ei4Uz;aO zD<^4Z99wz#$&LU52q1s}0tmE>K=tX zE;W5b0wRC_0tg_000QeOu=w-3Hb-L!AbatsO3IPPxAn;VqTDkbs>i5>+>v0tg_000IagfB*sr zAbGo}A)?=8{o?V=nI<;?hrH{aXQ zwmY5e>ds`-{rmT3@`cbrab%M?YdX}ON$(#{XNUI;WzwNGac;9H#*REwIl5IGof>^k zADbDH7s_+FY`;-KRtk&axXqQ$d@g?8AXPRlA1L(a3(*JCeO>vU$9j9@FS)@z=Kjb&w2M;RQfP8yLN|JOvp8#NEHpK% zJS?tq-4;t%nDdOieSFF(PfVF79w1N5DNkITC+?a>UZBb|Km5!GPI(f_Jjnog5>9!N z>O9H7d3HT`|Bp_2Qp!9X0rI4r@^q;4bOg?G>RM>kDUYVi6Aq9^bIKD|=eglBP{~@J zZwumxCdy$^mM7lWBJ)(%t4_JZq_drtHNc)hM!iYY|8GU}SV=a$uYWL~$z>}mSkze4 zjNNwGFYA&dyXk2=U%JY?Hq6g`eb!;D^rCXCH2-6z7oEmRQ;(ImNQ&UE$^Te+TO>rT@>rR(eKtMb?Vc?WB%8gG|7_kCbW^t1#P8cg85HHhN1LB0 zXY1|B_h+&LIpdMQ_ySdq96h8@_8l6TJgAQwUx!;o)rc1E(BhG>770fpsfV;DL(}>T zv-;$io}HZ-)n7C&l+A>r;va|YcF#@RL-R> zcfR7DEfOS~y^{ZI-WF>SQPd+A;GZ1y$U zLpFOQ-`T`M?{QOQo85l>WA|+KXE_hq?3H|HD<(WftISFBeK!AtewWOqdZ!4>0P@wx z@;qVx8kyd49NsCyPWRb}`aT=+6iIcTUH)$IocmbW-y=MXmA#Vxv5I*LCN5IW!&9d( zx@WV$^LfZ-ujD_Qw?Q*yGta|M&ODrVnuk&4Jhb1c+~;A`X&%PZ^U&LHmFJ;+I=n@c z+eH~aaPHIcSoIVNgPGnT@j`AqIf%2NZqqTjZ)}g2ewtlwdwJ!UlS^FbVt-_EcZoZ> zB-Ae6mYlLnL97b*h-?={IlA}qmt~j#pIyYCMLMhhQlXf&s>@vF>74jX>wAe_wC)$R zs{L@)zIcwa{HY~cwI8e6k5}y{s`isr`=0N+B8ua7M6SGIGtZsrf%yfexsz1R9s8?< S``k%7&7G8b?s$tU=gz+l0 +Date: Thu, 22 Apr 2021 10:03:53 +0200 +Subject: [PATCH 1/2] lib:ldb: Use a 1MiB lmdb so the test also passes on + aarch64 CentOS stream + +Signed-off-by: Gary Lockyer +Reviewed-by: Andreas Schneider +--- + lib/ldb/tests/ldb_lmdb_free_list_test.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/ldb/tests/ldb_lmdb_free_list_test.c b/lib/ldb/tests/ldb_lmdb_free_list_test.c +index 9b295460730..c87620e7a87 100644 +--- a/tests/ldb_lmdb_free_list_test.c ++++ b/tests/ldb_lmdb_free_list_test.c +@@ -77,7 +77,7 @@ + #endif /* TEST_BE */ + + const int RECORD_SIZE = 6144; +-const int ITERATIONS = 3; ++const int ITERATIONS = 192; + + struct test_ctx { + struct tevent_context *ev; +@@ -155,9 +155,9 @@ static int setup(void **state) + "@IDX_DN_GUID: GUID\n" + "\n"; + /* +- * Use a 64KiB DB for this test ++ * Use a 1MiB DB for this test + */ +- const char *options[] = {"lmdb_env_size:65536", NULL}; ++ const char *options[] = {"lmdb_env_size:1048576", NULL}; + + noconn_setup((void **)&test_ctx); + +-- +2.31.1 diff --git a/libldb.spec b/libldb.spec index 0597289..c89302e 100644 --- a/libldb.spec +++ b/libldb.spec @@ -25,7 +25,7 @@ Name: libldb Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A schema-less, ldap like, API and database Requires: libtalloc%{?_isa} >= %{talloc_version} Requires: libtdb%{?_isa} >= %{tdb_version} @@ -36,9 +36,14 @@ Source0: https://www.samba.org/ftp/ldb/ldb-%{version}.tar.gz Source1: https://www.samba.org/ftp/ldb/ldb-%{version}.tar.asc # gpg2 --no-default-keyring --keyring ./ldb.keyring --recv-keys 9147A339719518EE9011BCB54793916113084025 Source2: ldb.keyring +# binary diffs are not supported +# https://gitlab.com/samba-team/samba/-/merge_requests/1920 +Source3: fixed-guidindexpackv1.ldb # Patches Patch0001: 0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch +# https://gitlab.com/samba-team/samba/-/merge_requests/1920 +Patch0002: ldb-2.3.0-fix-tests-on-aarch64.patch BuildRequires: gcc BuildRequires: libtalloc-devel >= %{talloc_version} @@ -126,6 +131,9 @@ Development files for the Python bindings for the LDB library %prep %autosetup -n ldb-%{version} -p1 +# binary diffs are not supported +cp -f %{SOURCE3} tests/guidindexpackv1.ldb + %build zcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} - @@ -223,6 +231,9 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_* %endif %changelog +* Wed Apr 21 2021 Andreas Schneider - 2.3.0-3 +- resolves: #1951285 - Fix ldb tests on aarch64 + * Fri Apr 16 2021 Mohan Boddu - 2.3.0-2 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937