diff options
| author | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-07-26 10:47:46 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-07-26 10:47:46 +0530 |
| commit | ddcc612ce923038b867083a0c55d6e034951155a (patch) | |
| tree | a317973fbce08300ec81524c6fd98934a5d19cab | |
| parent | e785361ce30cc3b1bbc1da8979126b64a71fbb5a (diff) | |
| download | glibc-ddcc612ce923038b867083a0c55d6e034951155a.tar.gz glibc-ddcc612ce923038b867083a0c55d6e034951155a.tar.xz glibc-ddcc612ce923038b867083a0c55d6e034951155a.zip | |
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 <samuel.thibault@gnu.org> Tested-by: Samuel Thibault <samuel.thibault@gnu.org> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
| -rw-r--r-- | malloc/Makefile | 13 |
1 files 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 |