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.)

diff --git a/ChangeLog b/ChangeLog
index a7f14b7c312ab99ba19d1c45a8a35c92cc4dc37f..95ed4a698108887ec6dc7b97ad2e24ec4a212510 100644 (file)
--- 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.
+
 2016-08-03  Florian Weimer  <fweimer@redhat.com>
 
        [BZ #17730]

diff --git a/malloc/Makefile b/malloc/Makefile
index fa1730ecb75b9248efc45844ef27ed24c04318f3..4d5c81dce6332b35da45341d5160b2dc3f830d18 100644 (file)
--- 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 7ab3529c68d5116f45d2f951ebe37ff9ff26c110..7ded816a2da6c6a83f813c24c918ccd08d9ed59f 100644 (file)
--- a/test-skeleton.c
+++ b/test-skeleton.c
@@ -295,8 +295,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);