summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-02-09 23:14:35 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-02-10 01:03:55 +0000
commit6acd77229adda7e772bf5783145500f6cd074fd3 (patch)
tree46d03d0aec8858ee9de87f6a16c46348dbcb2563
parentf3a7ff069f74e4d6a89aba5fb9bba74f38d249c7 (diff)
downloadglibc-6acd77229adda7e772bf5783145500f6cd074fd3.tar.gz
glibc-6acd77229adda7e772bf5783145500f6cd074fd3.tar.xz
glibc-6acd77229adda7e772bf5783145500f6cd074fd3.zip
pthread: Move most barrier tests from nptl to sysdeps/pthread
So they can be checked with htl too.
-rw-r--r--nptl/Makefile1
-rw-r--r--sysdeps/mach/hurd/i386/Makefile1
-rw-r--r--sysdeps/pthread/Makefile1
-rw-r--r--sysdeps/pthread/tst-barrier1.c (renamed from nptl/tst-barrier1.c)0
-rw-r--r--sysdeps/pthread/tst-barrier2.c (renamed from nptl/tst-barrier2.c)0
-rw-r--r--sysdeps/pthread/tst-barrier3.c (renamed from nptl/tst-barrier3.c)0
-rw-r--r--sysdeps/pthread/tst-barrier4.c (renamed from nptl/tst-barrier4.c)0
7 files changed, 2 insertions, 1 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 80e293209c..a72022a052 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -250,7 +250,6 @@ tests = tst-attr2 tst-attr3 tst-default-attr \
 	tst-rwlock14 tst-rwlock15 tst-rwlock17 tst-rwlock18 \
 	tst-once5 \
 	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 \
 	tst-raise1 \
diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile
index a5ccab0956..445724f85f 100644
--- a/sysdeps/mach/hurd/i386/Makefile
+++ b/sysdeps/mach/hurd/i386/Makefile
@@ -112,6 +112,7 @@ test-xfail-tst-cond23 = yes
 test-xfail-tst-rwlock4 = yes
 test-xfail-tst-rwlock12 = yes
 test-xfail-tst-sem3 = yes
+test-xfail-tst-barrier2 = yes
 endif
 
 # For bug 25522
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index 2f07c0cfe6..c102f45b6a 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -43,6 +43,7 @@ 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-attr1 \
+	 tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
 	 tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
 	 tst-basic7 \
 	 tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \
diff --git a/nptl/tst-barrier1.c b/sysdeps/pthread/tst-barrier1.c
index d60f22f63d..d60f22f63d 100644
--- a/nptl/tst-barrier1.c
+++ b/sysdeps/pthread/tst-barrier1.c
diff --git a/nptl/tst-barrier2.c b/sysdeps/pthread/tst-barrier2.c
index d32c632ae0..d32c632ae0 100644
--- a/nptl/tst-barrier2.c
+++ b/sysdeps/pthread/tst-barrier2.c
diff --git a/nptl/tst-barrier3.c b/sysdeps/pthread/tst-barrier3.c
index 3e3066f352..3e3066f352 100644
--- a/nptl/tst-barrier3.c
+++ b/sysdeps/pthread/tst-barrier3.c
diff --git a/nptl/tst-barrier4.c b/sysdeps/pthread/tst-barrier4.c
index fdf6c40a37..fdf6c40a37 100644
--- a/nptl/tst-barrier4.c
+++ b/sysdeps/pthread/tst-barrier4.c