!14 fix tests failed when build with rpmbuild command

From: @eaglegai
Reviewed-by: @orange-snn
Signed-off-by: @orange-snn
This commit is contained in:
openeuler-ci-bot 2021-03-24 09:46:26 +08:00 committed by Gitee
commit f2bf31e740
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From eb5409dd5e4dde482935421ce0eddf88a0d2d2f4 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Thu, 25 Jun 2020 15:15:40 +0200
Subject: [PATCH] Skip ldb_lmdb_free_list_test on alpha, ia64, mips64el, ppc64el, ppc64 and sparc64
Workaround: https://bugzilla.samba.org/show_bug.cgi?id=14404
---
wscript | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -ruNa ldb-2.1.4/wscript ldb-2.1.4-org/wscript
--- ldb-2.1.4/wscript 2021-03-23 11:14:55.530512420 +0800
+++ ldb-2.1.4-org/wscript 2020-06-25 16:43:52.000000000 +0800
@@ -635,8 +635,9 @@
# fit > 4G of data into the DB), it would fill up the disk on
# many of our test instances
'ldb_mdb_kv_ops_test',
+ 'ldb_key_value_sub_txn_mdb_test']
+ if os.environ.get('DEB_HOST_ARCH', 'unknown') not in ['alpha', 'ia64', 'mips64el', 'ppc64el', 'ppc64', 'sparc64', 'unknown']:
+ test_exes += ['ldb_lmdb_free_list_test']
- 'ldb_key_value_sub_txn_mdb_test',
- 'ldb_lmdb_free_list_test']
else:
test_exes += ['ldb_no_lmdb_test']
--
2.26.2

View File

@ -6,7 +6,7 @@
Name: libldb
Version: 2.0.12
Release: 1
Release: 2
Summary: A schema-less, ldap like, API and database
Requires: libtalloc%{?_isa} >= %{talloc_version}
Requires: libtdb%{?_isa} >= %{tdb_version}
@ -15,6 +15,8 @@ License: LGPLv3+
URL: http://ldb.samba.org/
Source0: https://www.samba.org/ftp/ldb/ldb-%{version}.tar.gz
Patch0: Skip-ldb_lmdb_free_list_test-on-ppc64el-ppc64-and-sp.patch
BuildRequires: gcc libtalloc-devel >= %{talloc_version} libtdb-devel >= %{tdb_version}
BuildRequires: libtevent-devel >= %{tevent_version} lmdb-devel >= 0.9.16 popt-devel
BuildRequires: libxslt docbook-style-xsl python3-devel python3-tdb python3-talloc-devel
@ -150,6 +152,12 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
%{_mandir}/man1/ldbsearch.1.*
%changelog
* Tue Mar 23 2021 gaihuiying <gaihuiying1@huawei.com> - 2.0.12-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix tests failed when build with rpmbuild command
* Mon Aug 31 2020 gaihuiying <gaihuiying1@huawei.com> - 2.0.12-1
- Type:requirement
- ID:NA