This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[hurd,commited 08/10] pthread: Move most sem tests from nptl to sysdeps/pthread
- From: Samuel Thibault <samuel dot thibault at ens-lyon dot org>
- To: libc-alpha at sourceware dot org
- Cc: Samuel Thibault <samuel dot thibault at ens-lyon dot org>, commit-hurd at gnu dot org
- Date: Mon, 10 Feb 2020 02:05:06 +0100
- Subject: [hurd,commited 08/10] pthread: Move most sem tests from nptl to sysdeps/pthread
- References: <20200210010508.428251-1-samuel.thibault@ens-lyon.org>
So they can be checked with htl too.
---
nptl/Makefile | 4 +---
sysdeps/mach/hurd/i386/Makefile | 9 +++++++++
sysdeps/pthread/Makefile | 2 ++
{nptl => sysdeps/pthread}/tst-sem1.c | 0
{nptl => sysdeps/pthread}/tst-sem10.c | 0
{nptl => sysdeps/pthread}/tst-sem14.c | 0
{nptl => sysdeps/pthread}/tst-sem15.c | 0
{nptl => sysdeps/pthread}/tst-sem16.c | 0
{nptl => sysdeps/pthread}/tst-sem2.c | 0
{nptl => sysdeps/pthread}/tst-sem3.c | 0
{nptl => sysdeps/pthread}/tst-sem4.c | 0
{nptl => sysdeps/pthread}/tst-sem6.c | 0
{nptl => sysdeps/pthread}/tst-sem7.c | 0
{nptl => sysdeps/pthread}/tst-sem8.c | 0
{nptl => sysdeps/pthread}/tst-sem9.c | 0
15 files changed, 12 insertions(+), 3 deletions(-)
rename {nptl => sysdeps/pthread}/tst-sem1.c (100%)
rename {nptl => sysdeps/pthread}/tst-sem10.c (100%)
rename {nptl => sysdeps/pthread}/tst-sem14.c (100%)
rename {nptl => sysdeps/pthread}/tst-sem15.c (100%)
rename {nptl => sysdeps/pthread}/tst-sem16.c (100%)
rename {nptl => sysdeps/pthread}/tst-sem2.c (100%)
rename {nptl => sysdeps/pthread}/tst-sem3.c (100%)
rename {nptl => sysdeps/pthread}/tst-sem4.c (100%)
rename {nptl => sysdeps/pthread}/tst-sem6.c (100%)
rename {nptl => sysdeps/pthread}/tst-sem7.c (100%)
rename {nptl => sysdeps/pthread}/tst-sem8.c (100%)
rename {nptl => sysdeps/pthread}/tst-sem9.c (100%)
diff --git a/nptl/Makefile b/nptl/Makefile
index 8e53ff6a49..80e293209c 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -249,9 +249,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \
tst-rwlock9 tst-rwlock10 tst-rwlock11 tst-rwlock12 \
tst-rwlock14 tst-rwlock15 tst-rwlock17 tst-rwlock18 \
tst-once5 \
- tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \
- tst-sem8 tst-sem9 tst-sem10 tst-sem14 \
- tst-sem15 tst-sem16 tst-sem17 \
+ tst-sem5 tst-sem17 \
tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
tst-align tst-align3 \
tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \
diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile
index e303945b2a..a5ccab0956 100644
--- a/sysdeps/mach/hurd/i386/Makefile
+++ b/sysdeps/mach/hurd/i386/Makefile
@@ -111,6 +111,7 @@ test-xfail-tst-cond13 = yes
test-xfail-tst-cond23 = yes
test-xfail-tst-rwlock4 = yes
test-xfail-tst-rwlock12 = yes
+test-xfail-tst-sem3 = yes
endif
# For bug 25522
@@ -119,6 +120,14 @@ test-xfail-tst-cond24 = yes
test-xfail-tst-cond25 = yes
endif
+# For bug 25524
+ifeq ($(subdir),htl)
+test-xfail-tst-sem4 = yes
+test-xfail-tst-sem7 = yes
+test-xfail-tst-sem8 = yes
+test-xfail-tst-sem9 = yes
+endif
+
ifeq ($(subdir),elf)
# We do use nested functions involving creation of trampolines, notably for
# callbacks whose parameters don't permit to get the context parameters.
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index 8143eeb1ad..2f07c0cfe6 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -55,6 +55,8 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
tst-once1 tst-once2 tst-once3 tst-once4 \
tst-rwlock1 tst-rwlock4 tst-rwlock5 tst-rwlock13 tst-rwlock16 \
tst-rwlock-tryrdlock-stall tst-rwlock-trywrlock-stall \
+ tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem6 tst-sem7 \
+ tst-sem8 tst-sem9 tst-sem10 tst-sem14 tst-sem15 tst-sem16 \
tst-spin1 tst-spin2 tst-spin3 tst-spin4
tests += tst-oncex3 tst-oncex4
diff --git a/nptl/tst-sem1.c b/sysdeps/pthread/tst-sem1.c
similarity index 100%
rename from nptl/tst-sem1.c
rename to sysdeps/pthread/tst-sem1.c
diff --git a/nptl/tst-sem10.c b/sysdeps/pthread/tst-sem10.c
similarity index 100%
rename from nptl/tst-sem10.c
rename to sysdeps/pthread/tst-sem10.c
diff --git a/nptl/tst-sem14.c b/sysdeps/pthread/tst-sem14.c
similarity index 100%
rename from nptl/tst-sem14.c
rename to sysdeps/pthread/tst-sem14.c
diff --git a/nptl/tst-sem15.c b/sysdeps/pthread/tst-sem15.c
similarity index 100%
rename from nptl/tst-sem15.c
rename to sysdeps/pthread/tst-sem15.c
diff --git a/nptl/tst-sem16.c b/sysdeps/pthread/tst-sem16.c
similarity index 100%
rename from nptl/tst-sem16.c
rename to sysdeps/pthread/tst-sem16.c
diff --git a/nptl/tst-sem2.c b/sysdeps/pthread/tst-sem2.c
similarity index 100%
rename from nptl/tst-sem2.c
rename to sysdeps/pthread/tst-sem2.c
diff --git a/nptl/tst-sem3.c b/sysdeps/pthread/tst-sem3.c
similarity index 100%
rename from nptl/tst-sem3.c
rename to sysdeps/pthread/tst-sem3.c
diff --git a/nptl/tst-sem4.c b/sysdeps/pthread/tst-sem4.c
similarity index 100%
rename from nptl/tst-sem4.c
rename to sysdeps/pthread/tst-sem4.c
diff --git a/nptl/tst-sem6.c b/sysdeps/pthread/tst-sem6.c
similarity index 100%
rename from nptl/tst-sem6.c
rename to sysdeps/pthread/tst-sem6.c
diff --git a/nptl/tst-sem7.c b/sysdeps/pthread/tst-sem7.c
similarity index 100%
rename from nptl/tst-sem7.c
rename to sysdeps/pthread/tst-sem7.c
diff --git a/nptl/tst-sem8.c b/sysdeps/pthread/tst-sem8.c
similarity index 100%
rename from nptl/tst-sem8.c
rename to sysdeps/pthread/tst-sem8.c
diff --git a/nptl/tst-sem9.c b/sysdeps/pthread/tst-sem9.c
similarity index 100%
rename from nptl/tst-sem9.c
rename to sysdeps/pthread/tst-sem9.c
--
2.24.1