From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 7 Jun 2020 14:02:18 +0000 (+0000)
Subject: htl: Enable but XFAIL tst-flock2, tst-signal1, tst-signal2
X-Git-Tag: glibc-2.32~243
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bab9ad854b50fab23eacf29550325552e7a9f4b;p=thirdparty%2Fglibc.git

htl: Enable but XFAIL tst-flock2, tst-signal1, tst-signal2

They need setpshared support.

* nptl/tst-flock2.c, tst-signal1.c, tst-signal2.c: Move to...
* sysdeps/pthread: ... here.
* nptl/Makefile: Move corresponding tests references to...
* sysdeps/pthread/Makefile: ... here.
* sysdeps/mach/hurd/i386/Makefile (test-xfail-tst-flock2,
test-xfail-tst-signal1, test-xfail-tst-signal2): Add.
---

diff --git a/nptl/Makefile b/nptl/Makefile
index b1e60d303f9..9b549454f1a 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -282,8 +282,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \
 	tst-cancel16 tst-cancel17 tst-cancel20 tst-cancel21 tst-cancel24 \
 	tst-cancel-self tst-cancel-self-cancelstate \
 	tst-cleanup4 \
-	tst-flock2 \
-	tst-signal1 tst-signal2 tst-signal3 \
+	tst-signal3 \
 	tst-exec4 tst-exec5 \
 	tst-stack2 tst-stack3 tst-stack4 \
 	tst-pthread-attr-affinity \
diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile
index f3682ba7207..a67fe5d3936 100644
--- a/sysdeps/mach/hurd/i386/Makefile
+++ b/sysdeps/mach/hurd/i386/Makefile
@@ -119,6 +119,9 @@ test-xfail-tst-barrier2 = yes
 test-xfail-tst-pututxline-cache = yes
 test-xfail-tst-pututxline-lockfail = yes
 test-xfail-tst-mallocfork2 = yes
+test-xfail-tst-flock2 = yes
+test-xfail-tst-signal1 = yes
+test-xfail-tst-signal2 = yes
 
 # For bug 25522
 # (setprotocol support)
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index fb78e55e270..5f9610ecbf3 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -67,7 +67,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
 	 tst-eintr2 tst-eintr3 tst-eintr4 tst-eintr5 \
 	 tst-exec1 tst-exec2 tst-exec3 \
 	 tst-exit1 tst-exit2 tst-exit3 \
-	 tst-flock1 \
+	 tst-flock1 tst-flock2 \
 	 tst-fork1 tst-fork2 tst-fork3 tst-fork4 \
 	 tst-atfork1 \
 	 tst-getpid3 \
@@ -92,6 +92,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
 	 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-setuid3 \
+	 tst-signal1 tst-signal2 \
 	 tst-signal4 tst-signal5 tst-signal6 tst-signal8 \
 	 tst-spin1 tst-spin2 tst-spin3 tst-spin4 \
 	 tst-stack1 \
diff --git a/nptl/tst-flock2.c b/sysdeps/pthread/tst-flock2.c
similarity index 100%
rename from nptl/tst-flock2.c
rename to sysdeps/pthread/tst-flock2.c
diff --git a/nptl/tst-signal1.c b/sysdeps/pthread/tst-signal1.c
similarity index 100%
rename from nptl/tst-signal1.c
rename to sysdeps/pthread/tst-signal1.c
diff --git a/nptl/tst-signal2.c b/sysdeps/pthread/tst-signal2.c
similarity index 100%
rename from nptl/tst-signal2.c
rename to sysdeps/pthread/tst-signal2.c