This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.24-8-gf690b56
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 2 Aug 2016 15:06:56 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.24-8-gf690b56
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, master has been updated
via f690b56979dea81340a397c1b5e44827a6fb06e7 (commit)
from 533f9bebf969060e64c66681e275c03d6e49fcc9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f690b56979dea81340a397c1b5e44827a6fb06e7
commit f690b56979dea81340a397c1b5e44827a6fb06e7
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 b5fd436..3edcce4 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.
+
2016-08-02 Andrew Senkevich <andrew.senkevich@intel.com>
[BZ #20033]
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);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
malloc/Makefile | 4 ++++
test-skeleton.c | 2 ++
3 files changed, 13 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources