diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | malloc/Makefile | 4 | ||||
| -rw-r--r-- | test-skeleton.c | 2 |
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index f257b2be82..32faf08e7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-08-02 Florian Weimer <fweimer@redhat.com> + + [BZ #19469] + * malloc/Makefile (CPPFLAGS): Compile tests with + -DTEST_NO_MALLOPT. + * test-skeleton.c (main): Only call mallopt if !TEST_NO_MALLOPT. + 2017-01-05 Joseph Myers <joseph@codesourcery.com> [BZ #21026] 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 diff --git a/test-skeleton.c b/test-skeleton.c index d9bf989fa8..5a90c65826 100644 --- a/test-skeleton.c +++ b/test-skeleton.c @@ -346,8 +346,10 @@ main (int argc, char *argv[]) unsigned int timeoutfactor = 1; pid_t termpid; +#ifndef TEST_NO_MALLOPT /* Make uses of freed and uninitialized memory known. */ mallopt (M_PERTURB, 42); +#endif #ifdef STDOUT_UNBUFFERED setbuf (stdout, NULL); |