From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2206) id 472113864805; Mon, 26 Jul 2021 05:19:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 472113864805 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] Exclude static tests for mcheck and malloc-check X-Act-Checkin: glibc X-Git-Author: Siddhesh Poyarekar X-Git-Refname: refs/heads/master X-Git-Oldrev: e785361ce30cc3b1bbc1da8979126b64a71fbb5a X-Git-Newrev: ddcc612ce923038b867083a0c55d6e034951155a Message-Id: <20210726051913.472113864805@sourceware.org> Date: Mon, 26 Jul 2021 05:19:13 +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: Mon, 26 Jul 2021 05:19:13 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ddcc612ce923038b867083a0c55d6e034951155a commit ddcc612ce923038b867083a0c55d6e034951155a Author: Siddhesh Poyarekar Date: Mon Jul 26 10:47:46 2021 +0530 Exclude static tests for mcheck and malloc-check mcheck and malloc-check no longer work with static binaries, so drop those tests. Reported-by: Samuel Thibault Tested-by: Samuel Thibault Reviewed-by: Samuel Thibault Diff: --- malloc/Makefile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/malloc/Makefile b/malloc/Makefile index d54285192a..9b70831d38 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -75,7 +75,8 @@ tests-exclude-malloc-check = tst-malloc-check tst-malloc-usable \ tst-compathooks-off tst-compathooks-on # Run all tests with MALLOC_CHECK_=3 -tests-malloc-check = $(filter-out $(tests-exclude-malloc-check),$(tests)) +tests-malloc-check = $(filter-out $(tests-exclude-malloc-check) \ + $(tests-static),$(tests)) # -lmcheck needs __malloc_initialize_hook, which was deprecated in 2.24. ifeq ($(have-GLIBC_2.23)$(build-shared),yesyes) @@ -94,7 +95,7 @@ tests-exclude-mcheck = tst-mallocstate \ tst-malloc_info \ tst-compathooks-off tst-compathooks-on -tests-mcheck = $(filter-out $(tests-exclude-mcheck), $(tests)) +tests-mcheck = $(filter-out $(tests-exclude-mcheck) $(tests-static), $(tests)) endif routines = malloc mcheck mtrace obstack reallocarray \ @@ -290,16 +291,8 @@ $(objpfx)tst-interpose-thread-mcheck: \ $(objpfx)tst-interpose-thread-malloc-check: \ $(objpfx)tst-interpose-aux-thread.o $(shared-thread-library) $(objpfx)tst-interpose-static-nothread: $(objpfx)tst-interpose-aux-nothread.o -$(objpfx)tst-interpose-static-nothread-mcheck: \ - $(objpfx)tst-interpose-aux-nothread.o -$(objpfx)tst-interpose-static-nothread-malloc-check: \ - $(objpfx)tst-interpose-aux-nothread.o $(objpfx)tst-interpose-static-thread: \ $(objpfx)tst-interpose-aux-thread.o $(static-thread-library) -$(objpfx)tst-interpose-static-thread-mcheck: \ - $(objpfx)tst-interpose-aux-thread.o $(static-thread-library) -$(objpfx)tst-interpose-static-thread-malloc-check: \ - $(objpfx)tst-interpose-aux-thread.o $(static-thread-library) tst-dynarray-ENV = MALLOC_TRACE=$(objpfx)tst-dynarray.mtrace \ LD_PRELOAD=$(objpfx)libc_malloc_debug.so