From patchwork Mon Feb 10 01:36:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 1235594 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-109347-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=gi4s5Cnd; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48G7mH14SJz9sRQ for ; Mon, 10 Feb 2020 12:36:30 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; q=dns; s= default; b=acP6WIXGUPjQxn6vDp8FqZzyEq0zroGbL4+/3qUZBj95JIG2fHI8b ybntRkH5xNHGI6rYIOd4O1I0Qko5Ra8QESTQHg22etBViZxwM7en9MU3K2kqDrDE 5nFlYfAIEmb0OX38B6xWfRbSBmistKt5P2JQbdc1Knrb2nK67H8L3M= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; s=default; bh=Gpt+scR57/ZS3gZQxiddcO/96Q8=; b=gi4s5CndCwhq8ATROEoFG7LQfYP6 U9WddpK4v4VoOlDa7FYA6f6fLxu1xloIejtjkXMEd6eSQeT/QDzk4IjjhtqBNiDM IVeFvu2KVnvcBNb4/v/HDoFpe4RYt+KBYxqpS0ZGEVqAeDplLe3M5Qd4dYOcnnYx MmcWVQJRJ4T0LMI= Received: (qmail 10036 invoked by alias); 10 Feb 2020 01:36:16 -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 9907 invoked by uid 89); 10 Feb 2020 01:36:16 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.1 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd, commited 2/2] pthread: Move some join tests from nptl to sysdeps/pthread Date: Mon, 10 Feb 2020 02:36:07 +0100 Message-Id: <20200210013607.430062-2-samuel.thibault@ens-lyon.org> In-Reply-To: <20200210013607.430062-1-samuel.thibault@ens-lyon.org> References: <20200210013607.430062-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 So they can be checked with htl too. --- nptl/Makefile | 9 ++------- nptl/tst-join10.c | 2 +- nptl/tst-join11.c | 2 +- nptl/tst-join12.c | 2 +- nptl/tst-join13.c | 2 +- nptl/tst-join8.c | 2 +- nptl/tst-join9.c | 2 +- sysdeps/pthread/Makefile | 8 ++++++++ {nptl => sysdeps/pthread}/tst-join1.c | 0 {nptl => sysdeps/pthread}/tst-join4.c | 0 {nptl => sysdeps/pthread}/tst-join5.c | 0 {nptl => sysdeps/pthread}/tst-join6.c | 0 {nptl => sysdeps/pthread}/tst-join7.c | 0 {nptl => sysdeps/pthread}/tst-join7mod.c | 0 14 files changed, 16 insertions(+), 13 deletions(-) rename {nptl => sysdeps/pthread}/tst-join1.c (100%) rename {nptl => sysdeps/pthread}/tst-join4.c (100%) rename {nptl => sysdeps/pthread}/tst-join5.c (100%) rename {nptl => sysdeps/pthread}/tst-join6.c (100%) rename {nptl => sysdeps/pthread}/tst-join7.c (100%) rename {nptl => sysdeps/pthread}/tst-join7mod.c (100%) diff --git a/nptl/Makefile b/nptl/Makefile index a72022a052..6f210d60e3 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -253,7 +253,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \ tst-align tst-align3 \ 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 \ + tst-join2 tst-join3 \ tst-join8 tst-join9 tst-join10 tst-join11 tst-join12 tst-join13 \ tst-join14 \ tst-detach1 \ @@ -385,7 +385,7 @@ modules-names = tst-atfork2mod tst-tls3mod tst-tls4moda tst-tls4modb \ tst-tls5mod tst-tls5moda tst-tls5modb tst-tls5modc \ tst-tls5modd tst-tls5mode tst-tls5modf tst-stack4mod \ tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod \ - tst-join7mod tst-compat-forwarder-mod tst-audit-threads-mod1 \ + tst-compat-forwarder-mod tst-audit-threads-mod1 \ tst-audit-threads-mod2 extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) \ tst-cleanup4aux.o tst-cleanupx4aux.o @@ -579,11 +579,6 @@ $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \ $(evaluate-test) endif -$(objpfx)tst-join7: $(libdl) $(shared-thread-library) -$(objpfx)tst-join7.out: $(objpfx)tst-join7mod.so -$(objpfx)tst-join7mod.so: $(shared-thread-library) -LDFLAGS-tst-join7mod.so = -Wl,-soname,tst-join7mod.so - $(objpfx)tst-dlsym1: $(libdl) $(shared-thread-library) $(objpfx)tst-fini1: $(shared-thread-library) $(objpfx)tst-fini1mod.so diff --git a/nptl/tst-join10.c b/nptl/tst-join10.c index 2d1d14f45d..6e94c00f75 100644 --- a/nptl/tst-join10.c +++ b/nptl/tst-join10.c @@ -17,4 +17,4 @@ . */ #define USE_PTHREAD_CLOCKJOIN_NP_REALTIME 1 -#include +#include diff --git a/nptl/tst-join11.c b/nptl/tst-join11.c index c03bd90403..ed8312bc6b 100644 --- a/nptl/tst-join11.c +++ b/nptl/tst-join11.c @@ -18,4 +18,4 @@ #define USE_PTHREAD_CLOCKJOIN_NP_REALTIME 1 #define WAIT_IN_CHILD 1 -#include +#include diff --git a/nptl/tst-join12.c b/nptl/tst-join12.c index 10e45bf40c..57d713c82d 100644 --- a/nptl/tst-join12.c +++ b/nptl/tst-join12.c @@ -17,4 +17,4 @@ . */ #define USE_PTHREAD_CLOCKJOIN_NP_MONOTONIC 1 -#include +#include diff --git a/nptl/tst-join13.c b/nptl/tst-join13.c index 640df5946b..61a9106ebf 100644 --- a/nptl/tst-join13.c +++ b/nptl/tst-join13.c @@ -18,4 +18,4 @@ #define USE_PTHREAD_CLOCKJOIN_NP_MONOTONIC 1 #define WAIT_IN_CHILD 1 -#include +#include diff --git a/nptl/tst-join8.c b/nptl/tst-join8.c index 6232bbbd3b..3eddabab6f 100644 --- a/nptl/tst-join8.c +++ b/nptl/tst-join8.c @@ -17,4 +17,4 @@ . */ #define USE_PTHREAD_TIMEDJOIN_NP 1 -#include +#include diff --git a/nptl/tst-join9.c b/nptl/tst-join9.c index 6dc57e8477..e9d0f26146 100644 --- a/nptl/tst-join9.c +++ b/nptl/tst-join9.c @@ -18,4 +18,4 @@ #define USE_PTHREAD_TIMEDJOIN_NP 1 #define WAIT_IN_CHILD 1 -#include +#include diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index c102f45b6a..396f2b18bf 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -51,6 +51,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \ tst-cond23 tst-cond24 tst-cond25 \ tst-cond-except \ + tst-join1 tst-join4 tst-join5 tst-join6 tst-join7 \ tst-key1 tst-key2 tst-key3 tst-key4 \ tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex6 tst-mutex10 \ tst-once1 tst-once2 tst-once3 tst-once4 \ @@ -62,6 +63,8 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tests += tst-oncex3 tst-oncex4 +modules-names += tst-join7mod + ifeq ($(build-shared),yes) tests-static += tst-cond8-static tests += tst-cond8-static @@ -70,4 +73,9 @@ endif CFLAGS-tst-oncex3.c += -fexceptions CFLAGS-tst-oncex4.c += -fexceptions +$(objpfx)tst-join7: $(libdl) $(shared-thread-library) +$(objpfx)tst-join7.out: $(objpfx)tst-join7mod.so +$(objpfx)tst-join7mod.so: $(shared-thread-library) +LDFLAGS-tst-join7mod.so = -Wl,-soname,tst-join7mod.so + endif diff --git a/nptl/tst-join1.c b/sysdeps/pthread/tst-join1.c similarity index 100% rename from nptl/tst-join1.c rename to sysdeps/pthread/tst-join1.c diff --git a/nptl/tst-join4.c b/sysdeps/pthread/tst-join4.c similarity index 100% rename from nptl/tst-join4.c rename to sysdeps/pthread/tst-join4.c diff --git a/nptl/tst-join5.c b/sysdeps/pthread/tst-join5.c similarity index 100% rename from nptl/tst-join5.c rename to sysdeps/pthread/tst-join5.c diff --git a/nptl/tst-join6.c b/sysdeps/pthread/tst-join6.c similarity index 100% rename from nptl/tst-join6.c rename to sysdeps/pthread/tst-join6.c diff --git a/nptl/tst-join7.c b/sysdeps/pthread/tst-join7.c similarity index 100% rename from nptl/tst-join7.c rename to sysdeps/pthread/tst-join7.c diff --git a/nptl/tst-join7mod.c b/sysdeps/pthread/tst-join7mod.c similarity index 100% rename from nptl/tst-join7mod.c rename to sysdeps/pthread/tst-join7mod.c