[packages/drpm] - valgrind bcond, disable valgrind test on x32; release 2

qboosh qboosh at pld-linux.org
Mon Oct 9 19:53:27 CEST 2023


commit 9d0105e6ee91e05a1d894f4a1bebb28d6408d17b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Oct 9 19:34:45 2023 +0200

    - valgrind bcond, disable valgrind test on x32; release 2

 drpm.spec | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/drpm.spec b/drpm.spec
index 30ad77e..3067725 100644
--- a/drpm.spec
+++ b/drpm.spec
@@ -2,12 +2,17 @@
 # Conditional build:
 %bcond_without	apidocs		# API documentation
 %bcond_without	tests		# tests
+%bcond_without	valgrind	# valgrind tests
 #
+# valgrind archs without x32 (x32 valgrind is actually x86_64)
+%ifnarch %{ix86} %{x8664} %{armv7} ppc ppc64 s390x aarch64
+%undefine	with_valgrind
+%endif
 Summary:	Library for making, reading and applying deltarpm packages
 Summary(pl.UTF-8):	Biblioteka do tworzenia, odczytu i aplikowania pakietów deltarpm
 Name:		drpm
 Version:	0.5.2
-Release:	1
+Release:	2
 # drpm_{diff,search}.c are BSD; the rest LGPL v3+
 License:	LGPL v3+ with BSD parts
 Group:		Libraries
@@ -32,9 +37,11 @@ BuildRequires:	zstd-devel
 %if %{with tests}
 BuildRequires:	cmocka-devel
 BuildRequires:	deltarpm
+%if %{with valgrind}
 BuildRequires:	glibc-debuginfo
 BuildRequires:	valgrind
 %endif
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -80,7 +87,8 @@ cd build
 %{__make}
 
 %if %{with tests}
-ctest
+ctest \
+	%{!?with_valgrind:-E drpm_memcheck}
 %endif
 
 %if %{with apidocs}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/drpm.git/commitdiff/9d0105e6ee91e05a1d894f4a1bebb28d6408d17b



More information about the pld-cvs-commit mailing list