From 1160fe6de333e819d0f237e1df2d4478429bcfee Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Tue, 9 Aug 2022 14:09:15 +0300 Subject: [PATCH] Revert "Remove check bits completely" This reverts commit 201597d182e8b3c13b5c4ef1347dcdf0f4a6e113. Signed-off-by: David Abdurachmanov --- rpm.spec | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/rpm.spec b/rpm.spec index 3f6b590..253ff31 100644 --- a/rpm.spec +++ b/rpm.spec @@ -2,6 +2,14 @@ %global debug_package %{nil} %endif +# run internal testsuite? +# fakechroot is severely broken beyond fedora 33, disable... +#%if 0%{?fedora} > 33 || 0%{?rhel} > 8 +%bcond_with check +#%else +#%bcond_without check +#%endif + # build against xz? %bcond_without xz # build with plugins? @@ -69,6 +77,11 @@ Requires: popt%{_isa} >= 1.10.2.1 Requires: curl Obsoletes: python2-rpm < %{version}-%{release} +%if %{with check} +BuildRequires: fakechroot gnupg2 +BuildRequires: debugedit >= 0.3 +%endif + # XXX generally assumed to be installed but make it explicit as rpm # is a bit special... BuildRequires: redhat-rpm-config >= 94 @@ -413,6 +426,13 @@ rm -f $RPM_BUILD_ROOT/%{rpmhome}/{perldeps.pl,perl.*,pythond*} rm -f $RPM_BUILD_ROOT/%{_fileattrsdir}/{perl*,python*} rm -rf $RPM_BUILD_ROOT/var/tmp +%if %{with check} +%check +make check TESTSUITEFLAGS=-j%{_smp_build_ncpus} || (cat tests/rpmtests.log; exit 1) +# rpm >= 4.16.0 testsuite leaves a read-only tree behind, clean it up +make clean +%endif + %pre # Symlink all rpmdb files to the new location if we're still using /var/lib/rpm if [ -d /var/lib/rpm ]; then