[hurd,commited] pthread: Move basic tests from nptl to sysdeps/pthread
Commit Message
So they can be checked with htl too.
---
nptl/Makefile | 2 --
sysdeps/pthread/Makefile | 5 ++++-
{nptl => sysdeps/pthread}/tst-basic1.c | 0
{nptl => sysdeps/pthread}/tst-basic2.c | 0
{nptl => sysdeps/pthread}/tst-basic3.c | 0
{nptl => sysdeps/pthread}/tst-basic4.c | 0
{nptl => sysdeps/pthread}/tst-basic5.c | 0
{nptl => sysdeps/pthread}/tst-basic6.c | 0
{nptl => sysdeps/pthread}/tst-basic7.c | 4 ++++
9 files changed, 8 insertions(+), 3 deletions(-)
rename {nptl => sysdeps/pthread}/tst-basic1.c (100%)
rename {nptl => sysdeps/pthread}/tst-basic2.c (100%)
rename {nptl => sysdeps/pthread}/tst-basic3.c (100%)
rename {nptl => sysdeps/pthread}/tst-basic4.c (100%)
rename {nptl => sysdeps/pthread}/tst-basic5.c (100%)
rename {nptl => sysdeps/pthread}/tst-basic6.c (100%)
rename {nptl => sysdeps/pthread}/tst-basic7.c (94%)
Comments
Hi Samuel,
Just informative - as of the current master - SHA1:
d5ec049d44f019deaeed8adc0bd10819e5569e93
the plt check for HURD fails:
Extra PLT reference: libpthread.so: __pthread_get_cleanup_stack
glibc/glibc-many-build/build/glibcs/i686-gnu/glibc/elf/check-localplt.out
To reproduce:
../src/scripts/build-many-glibcs.py
/home/lukma/work/glibc/glibc-many-build glibcs i686-gnu --keep all
PASS: glibcs-i686-gnu check-compilers
PASS: glibcs-i686-gnu rm
PASS: glibcs-i686-gnu mkdir
PASS: glibcs-i686-gnu configure
PASS: glibcs-i686-gnu build
PASS: glibcs-i686-gnu install
PASS: glibcs-i686-gnu mkdir-lib
FAIL: glibcs-i686-gnu check
PASS: glibcs-i686-gnu save-logs
> So they can be checked with htl too.
> ---
> nptl/Makefile | 2 --
> sysdeps/pthread/Makefile | 5 ++++-
> {nptl => sysdeps/pthread}/tst-basic1.c | 0
> {nptl => sysdeps/pthread}/tst-basic2.c | 0
> {nptl => sysdeps/pthread}/tst-basic3.c | 0
> {nptl => sysdeps/pthread}/tst-basic4.c | 0
> {nptl => sysdeps/pthread}/tst-basic5.c | 0
> {nptl => sysdeps/pthread}/tst-basic6.c | 0
> {nptl => sysdeps/pthread}/tst-basic7.c | 4 ++++
> 9 files changed, 8 insertions(+), 3 deletions(-)
> rename {nptl => sysdeps/pthread}/tst-basic1.c (100%)
> rename {nptl => sysdeps/pthread}/tst-basic2.c (100%)
> rename {nptl => sysdeps/pthread}/tst-basic3.c (100%)
> rename {nptl => sysdeps/pthread}/tst-basic4.c (100%)
> rename {nptl => sysdeps/pthread}/tst-basic5.c (100%)
> rename {nptl => sysdeps/pthread}/tst-basic6.c (100%)
> rename {nptl => sysdeps/pthread}/tst-basic7.c (94%)
>
> diff --git a/nptl/Makefile b/nptl/Makefile
> index f762ea26a3..812d01a4e1 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -262,8 +262,6 @@ tests = tst-attr1 tst-attr2 tst-attr3
> tst-default-attr \ tst-sem15 tst-sem16 tst-sem17 \
> tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
> tst-align tst-align3 \
> - tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5
> tst-basic6 \
> - tst-basic7 \
> tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \
> tst-raise1 \
> tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 tst-join6
> tst-join7 \ diff --git a/sysdeps/pthread/Makefile
> b/sysdeps/pthread/Makefile index 889f10d8b1..db4d573070 100644
> --- a/sysdeps/pthread/Makefile
> +++ b/sysdeps/pthread/Makefile
> @@ -41,5 +41,8 @@ libpthread-routines += thrd_create thrd_detach
> thrd_exit thrd_join \
> tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
> tst-cnd-timedwait tst-thrd-detach tst-mtx-basic
> tst-thrd-sleep \
> - tst-mtx-recursive tst-tss-basic tst-call-once
> tst-mtx-timedlock
> + tst-mtx-recursive tst-tss-basic tst-call-once
> tst-mtx-timedlock \
> + tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5
> tst-basic6 \
> + tst-basic7 \
> +
> endif
> diff --git a/nptl/tst-basic1.c b/sysdeps/pthread/tst-basic1.c
> similarity index 100%
> rename from nptl/tst-basic1.c
> rename to sysdeps/pthread/tst-basic1.c
> diff --git a/nptl/tst-basic2.c b/sysdeps/pthread/tst-basic2.c
> similarity index 100%
> rename from nptl/tst-basic2.c
> rename to sysdeps/pthread/tst-basic2.c
> diff --git a/nptl/tst-basic3.c b/sysdeps/pthread/tst-basic3.c
> similarity index 100%
> rename from nptl/tst-basic3.c
> rename to sysdeps/pthread/tst-basic3.c
> diff --git a/nptl/tst-basic4.c b/sysdeps/pthread/tst-basic4.c
> similarity index 100%
> rename from nptl/tst-basic4.c
> rename to sysdeps/pthread/tst-basic4.c
> diff --git a/nptl/tst-basic5.c b/sysdeps/pthread/tst-basic5.c
> similarity index 100%
> rename from nptl/tst-basic5.c
> rename to sysdeps/pthread/tst-basic5.c
> diff --git a/nptl/tst-basic6.c b/sysdeps/pthread/tst-basic6.c
> similarity index 100%
> rename from nptl/tst-basic6.c
> rename to sysdeps/pthread/tst-basic6.c
> diff --git a/nptl/tst-basic7.c b/sysdeps/pthread/tst-basic7.c
> similarity index 94%
> rename from nptl/tst-basic7.c
> rename to sysdeps/pthread/tst-basic7.c
> index 29a2461efe..26a599c178 100644
> --- a/nptl/tst-basic7.c
> +++ b/sysdeps/pthread/tst-basic7.c
> @@ -55,7 +55,11 @@ do_test (void)
> pthread_t tid;
>
> /* Allocate the memory needed for the stack. */
> +#ifdef PTHREAD_STACK_MIN
> use_stack_ptr (PTHREAD_STACK_MIN);
> +#else
> + use_stack_ptr (4 * getpagesize ());
> +#endif
>
> use_up_memory ();
>
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
Lukasz Majewski, le lun. 10 févr. 2020 11:04:10 +0100, a ecrit:
> Just informative - as of the current master - SHA1:
> d5ec049d44f019deaeed8adc0bd10819e5569e93
>
> the plt check for HURD fails:
>
> Extra PLT reference: libpthread.so: __pthread_get_cleanup_stack
> glibc/glibc-many-build/build/glibcs/i686-gnu/glibc/elf/check-localplt.out
Oh? I had that issue and had it fixed by f1cd3407e4c6 ("htl: clean
__pthread_get_cleanup_stack hidden proto"). I guess further commits
broke it again, I'll have a look.
Samuel
Samuel Thibault, le lun. 10 févr. 2020 11:09:12 +0100, a ecrit:
> Lukasz Majewski, le lun. 10 févr. 2020 11:04:10 +0100, a ecrit:
> > Just informative - as of the current master - SHA1:
> > d5ec049d44f019deaeed8adc0bd10819e5569e93
> >
> > the plt check for HURD fails:
> >
> > Extra PLT reference: libpthread.so: __pthread_get_cleanup_stack
> > glibc/glibc-many-build/build/glibcs/i686-gnu/glibc/elf/check-localplt.out
>
> Oh? I had that issue and had it fixed by f1cd3407e4c6 ("htl: clean
> __pthread_get_cleanup_stack hidden proto"). I guess further commits
> broke it again, I'll have a look.
f1cd3407e4c6 is actually after d5ec049d44f0, I guess you had pulled
before that.
There was however another issue with the current master, now fixed as of
1433e270a16442ae9a86dc749d9cbd5e1f55405d
Samuel
@@ -262,8 +262,6 @@ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
tst-sem15 tst-sem16 tst-sem17 \
tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
tst-align tst-align3 \
- tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
- tst-basic7 \
tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \
tst-raise1 \
tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 tst-join6 tst-join7 \
@@ -41,5 +41,8 @@ libpthread-routines += thrd_create thrd_detach thrd_exit thrd_join \
tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
tst-cnd-timedwait tst-thrd-detach tst-mtx-basic tst-thrd-sleep \
- tst-mtx-recursive tst-tss-basic tst-call-once tst-mtx-timedlock
+ tst-mtx-recursive tst-tss-basic tst-call-once tst-mtx-timedlock \
+ tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
+ tst-basic7 \
+
endif
similarity index 100%
rename from nptl/tst-basic1.c
rename to sysdeps/pthread/tst-basic1.c
similarity index 100%
rename from nptl/tst-basic2.c
rename to sysdeps/pthread/tst-basic2.c
similarity index 100%
rename from nptl/tst-basic3.c
rename to sysdeps/pthread/tst-basic3.c
similarity index 100%
rename from nptl/tst-basic4.c
rename to sysdeps/pthread/tst-basic4.c
similarity index 100%
rename from nptl/tst-basic5.c
rename to sysdeps/pthread/tst-basic5.c
similarity index 100%
rename from nptl/tst-basic6.c
rename to sysdeps/pthread/tst-basic6.c
similarity index 94%
rename from nptl/tst-basic7.c
rename to sysdeps/pthread/tst-basic7.c
@@ -55,7 +55,11 @@ do_test (void)
pthread_t tid;
/* Allocate the memory needed for the stack. */
+#ifdef PTHREAD_STACK_MIN
use_stack_ptr (PTHREAD_STACK_MIN);
+#else
+ use_stack_ptr (4 * getpagesize ());
+#endif
use_up_memory ();