| Message ID | 20210722140115.2911835-1-siddhesh@sourceware.org |
|---|---|
| State | New |
| Headers | show |
| Series | Exclude static tests for mcheck and malloc-check | expand |
Siddhesh Poyarekar, le jeu. 22 juil. 2021 19:31:15 +0530, a ecrit: > mcheck and malloc-check no longer work with static binaries, so drop > those tests. > > Reported-by: Samuel Thibault <samuel.thibault@gnu.org> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > --- > 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
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