From patchwork Sun Feb 9 16:14:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 37787 Received: (qmail 20205 invoked by alias); 9 Feb 2020 16:14:30 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 20193 invoked by uid 89); 9 Feb 2020 16:14:29 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.1 spammy=HContent-Transfer-Encoding:8bit X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd, commited] pthread: Move basic tests from nptl to sysdeps/pthread Date: Sun, 9 Feb 2020 17:14:24 +0100 Message-Id: <20200209161424.164642-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 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 ();