Remove memcheck conditional
This commit is contained in:
parent
53ec422778
commit
67d80e8ebc
@ -26,11 +26,6 @@
|
||||
%bcond_without staticlib
|
||||
|
||||
|
||||
# Do not run memcheck by default.
|
||||
# This is useful for development, only.
|
||||
%bcond_with memcheck
|
||||
|
||||
|
||||
# Shared object version of libcrypt.
|
||||
%if %{with new_api}
|
||||
%global soc 2
|
||||
@ -111,11 +106,7 @@
|
||||
%else \
|
||||
--disable-static \\\
|
||||
%endif \
|
||||
%if %{with memcheck} \
|
||||
--enable-valgrind \\\
|
||||
%else \
|
||||
--disable-valgrind \\\
|
||||
%endif \
|
||||
--srcdir=$(realpath ..) \\\
|
||||
--with-pkgconfigdir=%{_libdir}/pkgconfig
|
||||
|
||||
@ -183,9 +174,6 @@ BuildRequires: fipscheck
|
||||
BuildRequires: gcc
|
||||
BuildRequires: glibc-devel >= %{glibc_minver}
|
||||
BuildRequires: libtool
|
||||
%if %{with memcheck}
|
||||
BuildRequires: valgrind
|
||||
%endif
|
||||
|
||||
# We do not need to keep this forever.
|
||||
%if !(0%{?fedora} > 31 || 0%{?rhel} > 10)
|
||||
@ -412,16 +400,6 @@ for dir in ${build_dirs}; do
|
||||
echo "-----END TESTLOG: ${dir}-----";
|
||||
exit $rc;
|
||||
}
|
||||
%if %{with memcheck}
|
||||
%make_build -C ${dir} check-valgrind-memcheck || \
|
||||
{
|
||||
rc=$?;
|
||||
echo "-----BEGIN TESTLOG: ${dir}-----";
|
||||
cat ${dir}/test-suite-memcheck.log;
|
||||
echo "-----END TESTLOG: ${dir}-----";
|
||||
exit $rc;
|
||||
}
|
||||
%endif
|
||||
done
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user