summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@sourceware.org>2021-07-22 18:37:41 +0530
committerSiddhesh Poyarekar <siddhesh@sourceware.org>2021-07-22 18:37:41 +0530
commit0075c4f39dcc53025103e2919aa74b02f776c1d2 (patch)
treea56e4cd6de76038ea1929bb86d3c0e9588c63e3d /malloc
parent094ed6b0cc4ef239d197881247431ba37fac0803 (diff)
downloadglibc-0075c4f39dcc53025103e2919aa74b02f776c1d2.tar.gz
glibc-0075c4f39dcc53025103e2919aa74b02f776c1d2.tar.xz
glibc-0075c4f39dcc53025103e2919aa74b02f776c1d2.zip
Make mcheck tests conditional on GLIBC_2.23 or earlier
Targets with base versions of 2.24 or later won't have
__malloc_initialize_hook because of which the tests will essentially
be the same as the regular malloc tests.  Avoid running them instead
and save time.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'malloc')
-rw-r--r--malloc/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/malloc/Makefile b/malloc/Makefile
index 918828e050..063d103d97 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -78,6 +78,8 @@ tests-exclude-malloc-check = tst-malloc-check tst-malloc-usable \
 # Run all tests with MALLOC_CHECK_=3
 tests-malloc-check = $(filter-out $(tests-exclude-malloc-check),$(tests))
 
+# -lmcheck needs __malloc_initialize_hook, which was deprecated in 2.24.
+ifeq ($(have-GLIBC_2.23)$(build-shared),yesyes)
 # Tests that don't play well with mcheck.  They are either bugs in mcheck or
 # the tests expect specific internal behavior that is changed due to linking to
 # libmcheck.a.
@@ -100,6 +102,7 @@ tests-exclude-mcheck = tst-mallocstate \
 	tst-reallocarray
 
 tests-mcheck = $(filter-out $(tests-exclude-mcheck), $(tests))
+endif
 
 routines = malloc morecore mcheck mtrace obstack reallocarray \
   scratch_buffer_dupfree \