Message ID | 20210721190428.dfnqd4lpqdpohy2a@begin |
---|---|
State | New |
Headers | show |
Series | tst-interpose-static-thread-{m,malloc-}check linking statically? | expand |
Siddhesh Poyarekar, le jeu. 22 juil. 2021 02:48:06 +0530, a ecrit: > On 22-Jul-2021 00:34, Samuel Thibault via Libc-alpha > <libc-alpha@sourceware.org> wrote: > > > tl;dr: I believe we want the patch below? AIUI the > > tst-interpose-static-{no,}thread-{m,malloc-}check tests are supposed to > > be linked completely statically? > > Those tests ought to be removed when malloc hooks get dropped since mcheck and > malloc-check won't work with static libraries. So this? Or just excluding tst-interpose-static-thread? diff --git a/malloc/Makefile b/malloc/Makefile index d54285192a..0980e2901b 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -72,7 +72,8 @@ test-srcs = tst-mtrace # with MALLOC_CHECK_=3 because they expect a specific failure. tests-exclude-malloc-check = tst-malloc-check tst-malloc-usable \ tst-mxfast tst-safe-linking \ - tst-compathooks-off tst-compathooks-on + tst-compathooks-off tst-compathooks-on \ + tst-interpose-static-nothread tst-interpose-static-thread # Run all tests with MALLOC_CHECK_=3 tests-malloc-check = $(filter-out $(tests-exclude-malloc-check),$(tests)) @@ -92,7 +93,8 @@ tests-exclude-mcheck = tst-mallocstate \ tst-malloc-thread-fail \ tst-malloc-usable-tunables \ tst-malloc_info \ - tst-compathooks-off tst-compathooks-on + tst-compathooks-off tst-compathooks-on \ + tst-interpose-static-nothread tst-interpose-static-thread tests-mcheck = $(filter-out $(tests-exclude-mcheck), $(tests)) endif
On 7/23/21 12:06 AM, Samuel Thibault wrote: > Siddhesh Poyarekar, le jeu. 22 juil. 2021 02:48:06 +0530, a ecrit: >> On 22-Jul-2021 00:34, Samuel Thibault via Libc-alpha >> <libc-alpha@sourceware.org> wrote: >> >>> tl;dr: I believe we want the patch below? AIUI the >>> tst-interpose-static-{no,}thread-{m,malloc-}check tests are supposed to >>> be linked completely statically? >> >> Those tests ought to be removed when malloc hooks get dropped since mcheck and >> malloc-check won't work with static libraries. > > So this? Or just excluding tst-interpose-static-thread? Excluding all static tets, like this: https://patchwork.sourceware.org/project/glibc/patch/20210722140115.2911835-1-siddhesh@sourceware.org/ Could you please see if the above patch fixes it for you? Thanks, Siddhesh
Siddhesh Poyarekar, le ven. 23 juil. 2021 06:58:01 +0530, a ecrit: > On 7/23/21 12:06 AM, Samuel Thibault wrote: > > Siddhesh Poyarekar, le jeu. 22 juil. 2021 02:48:06 +0530, a ecrit: > > > On 22-Jul-2021 00:34, Samuel Thibault via Libc-alpha > > > <libc-alpha@sourceware.org> wrote: > > > > > > > tl;dr: I believe we want the patch below? AIUI the > > > > tst-interpose-static-{no,}thread-{m,malloc-}check tests are supposed to > > > > be linked completely statically? > > > > > > Those tests ought to be removed when malloc hooks get dropped since mcheck and > > > malloc-check won't work with static libraries. > > > > So this? Or just excluding tst-interpose-static-thread? > > Excluding all static tets, like this: > > https://patchwork.sourceware.org/project/glibc/patch/20210722140115.2911835-1-siddhesh@sourceware.org/ > > Could you please see if the above patch fixes it for you? Yes, that fixes it! Samuel
On 7/23/21 1:15 PM, Samuel Thibault wrote: >> Excluding all static tets, like this: >> >> https://patchwork.sourceware.org/project/glibc/patch/20210722140115.2911835-1-siddhesh@sourceware.org/ >> >> Could you please see if the above patch fixes it for you? > > Yes, that fixes it! Thanks for confirming, could you please review the patch too? I can then push it since it is a bug fix and doesn't impact ABI. Siddhesh
diff --git a/malloc/Makefile b/malloc/Makefile index 47369b6084..fc66abe94b 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -46,7 +46,11 @@ tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \ tests-static := \ tst-interpose-static-nothread \ + tst-interpose-static-nothread-mcheck \ + tst-interpose-static-nothread-malloc-check \ tst-interpose-static-thread \ + tst-interpose-static-thread-mcheck \ + tst-interpose-static-thread-malloc-check \ tst-malloc-usable-static \ # Test for the malloc_set_state symbol removed in glibc 2.25.