diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-02-09 16:12:35 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-02-09 16:12:53 +0000 |
| commit | cca76b6db216805267212ab03c8691e8e6960338 (patch) | |
| tree | 3a668a36d36fc7d3fa309656f0131e9ed53ea4cc | |
| parent | 19a64d9f6eda12cd4b802aac470c645d208a1216 (diff) | |
| download | glibc-cca76b6db216805267212ab03c8691e8e6960338.tar.gz glibc-cca76b6db216805267212ab03c8691e8e6960338.tar.xz glibc-cca76b6db216805267212ab03c8691e8e6960338.zip | |
pthread: Move basic tests from nptl to sysdeps/pthread
So they can be checked with htl too.
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/Makefile | 5 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-basic1.c (renamed from nptl/tst-basic1.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-basic2.c (renamed from nptl/tst-basic2.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-basic3.c (renamed from nptl/tst-basic3.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-basic4.c (renamed from nptl/tst-basic4.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-basic5.c (renamed from nptl/tst-basic5.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-basic6.c (renamed from nptl/tst-basic6.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-basic7.c (renamed from nptl/tst-basic7.c) | 4 |
9 files changed, 8 insertions, 3 deletions
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 index 6e3012f83d..6e3012f83d 100644 --- a/nptl/tst-basic1.c +++ b/sysdeps/pthread/tst-basic1.c diff --git a/nptl/tst-basic2.c b/sysdeps/pthread/tst-basic2.c index ce20e270c4..ce20e270c4 100644 --- a/nptl/tst-basic2.c +++ b/sysdeps/pthread/tst-basic2.c diff --git a/nptl/tst-basic3.c b/sysdeps/pthread/tst-basic3.c index 14eda8a678..14eda8a678 100644 --- a/nptl/tst-basic3.c +++ b/sysdeps/pthread/tst-basic3.c diff --git a/nptl/tst-basic4.c b/sysdeps/pthread/tst-basic4.c index 78e277717c..78e277717c 100644 --- a/nptl/tst-basic4.c +++ b/sysdeps/pthread/tst-basic4.c diff --git a/nptl/tst-basic5.c b/sysdeps/pthread/tst-basic5.c index bc4a12b544..bc4a12b544 100644 --- a/nptl/tst-basic5.c +++ b/sysdeps/pthread/tst-basic5.c diff --git a/nptl/tst-basic6.c b/sysdeps/pthread/tst-basic6.c index 38ce40151c..38ce40151c 100644 --- a/nptl/tst-basic6.c +++ b/sysdeps/pthread/tst-basic6.c diff --git a/nptl/tst-basic7.c b/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 (); |