about summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-08-02 17:01:02 +0200
committerFlorian Weimer <fweimer@redhat.com>2016-08-02 17:06:11 +0200
commitf690b56979dea81340a397c1b5e44827a6fb06e7 (patch)
tree8f35d95314bc9d487be96e6be7fb73c485ae0c72 /malloc
parent533f9bebf969060e64c66681e275c03d6e49fcc9 (diff)
downloadglibc-f690b56979dea81340a397c1b5e44827a6fb06e7.tar.gz
glibc-f690b56979dea81340a397c1b5e44827a6fb06e7.tar.xz
glibc-f690b56979dea81340a397c1b5e44827a6fb06e7.zip
malloc: Run tests without calling mallopt [BZ #19469]
The compiled tests no longer refer to the mallopt symbol
from their main functions.  (Some tests still call mallopt
explicitly, which is fine.)
Diffstat (limited to 'malloc')
-rw-r--r--malloc/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/malloc/Makefile b/malloc/Makefile
index fa1730ecb7..4d5c81dce6 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -166,3 +166,7 @@ $(objpfx)libmemusage.so: $(libdl)
 
 # Extra dependencies
 $(foreach o,$(all-object-suffixes),$(objpfx)malloc$(o)): arena.c hooks.c
+
+# Compile the tests with a flag which suppresses the mallopt call in
+# the test skeleton.
+$(tests:%=$(objpfx)%.o): CPPFLAGS += -DTEST_NO_MALLOPT