This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch bug19469 created. glibc-2.24-7-gf1af220
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 2 Aug 2016 15:05:18 -0000
- Subject: GNU C Library master sources branch bug19469 created. glibc-2.24-7-gf1af220
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, bug19469 has been created
at f1af220bed4862ab8ebf797d12bf8515c82b9182 (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f1af220bed4862ab8ebf797d12bf8515c82b9182
commit f1af220bed4862ab8ebf797d12bf8515c82b9182
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue Aug 2 17:01:02 2016 +0200
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 c8ea740..025d44a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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-02 Florian Weimer <fweimer@redhat.com>
+
[BZ #20370]
* malloc/arena.c (get_free_list): Update comment. Assert that
arenas on the free list have no attached threads.
diff --git a/malloc/Makefile b/malloc/Makefile
index fa1730e..4d5c81d 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 d9bf989..5a90c65 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);
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources