From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2206) id 9822C393D01A; Tue, 13 Jul 2021 03:39:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9822C393D01A Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Siddhesh Poyarekar To: glibc-cvs@sourceware.org Subject: [glibc/siddhesh/malloc-hooks] Make mcheck tests conditional on GLIBC_2.24 or earlier X-Act-Checkin: glibc X-Git-Author: Siddhesh Poyarekar X-Git-Refname: refs/heads/siddhesh/malloc-hooks X-Git-Oldrev: 2e1cf7bd711c3491b995977aa5a1c72c036e9b02 X-Git-Newrev: fbd44c3656fa1206dbfcdc6f636f925ed95850e9 Message-Id: <20210713033933.9822C393D01A@sourceware.org> Date: Tue, 13 Jul 2021 03:39:33 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jul 2021 03:39:33 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fbd44c3656fa1206dbfcdc6f636f925ed95850e9 commit fbd44c3656fa1206dbfcdc6f636f925ed95850e9 Author: Siddhesh Poyarekar Date: Fri Jul 9 16:45:08 2021 +0530 Make mcheck tests conditional on GLIBC_2.24 or earlier Targets with base versions later than 2.24 won't have __malloc_initialize_hook because of which the tests will essentially be the same as the regular malloc tests. Avoid running them instead and save time. Diff: --- malloc/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/malloc/Makefile b/malloc/Makefile index 47369b6084..d15729569b 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -78,6 +78,8 @@ tests-exclude-malloc-check = tst-malloc-check tst-malloc-usable \ # Run all tests with MALLOC_CHECK_=3 tests-malloc-check = $(filter-out $(tests-exclude-malloc-check),$(tests)) +# -lmcheck needs __malloc_initialize_hook, which was deprecated in 2.24. +ifeq ($(have-GLIBC_2.24)$(build-shared),yesyes) # Tests that don't play well with mcheck. They are either bugs in mcheck or # the tests expect specific internal behavior that is changed due to linking to # libmcheck.a. @@ -100,6 +102,7 @@ tests-exclude-mcheck = tst-mallocstate \ tst-reallocarray tests-mcheck = $(filter-out $(tests-exclude-mcheck), $(tests)) +endif routines = malloc morecore mcheck mtrace obstack reallocarray \ scratch_buffer_dupfree \