From 67d80e8ebc1ab31f42dcaf247d351c84824af296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sat, 25 Apr 2020 10:01:41 +0200
Subject: [PATCH] Remove memcheck conditional

---
 libxcrypt.spec | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/libxcrypt.spec b/libxcrypt.spec
index e457648..202341e 100644
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -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