From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 20 Jun 2017 17:47:32 +0000 (+0000)
Subject: conformtest: XFAIL uc_sigmask test for ia64 (bug 21634).
X-Git-Tag: glibc-2.26~298
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0b5a3b6540524ede1986dbfc5f83dd478445cc2;p=thirdparty%2Fglibc.git

conformtest: XFAIL uc_sigmask test for ia64 (bug 21634).

This patch XFAILs one test where the ia64 ucontext_t has the wrong
type of a field, to allow the conform/ tests as a whole to pass once
the namespace issues are fixed.

Tested with build-many-glibcs.py.

	[BZ #21634]
	* sysdeps/unix/sysv/linux/ia64/Makefile [$(subdir) = conform]
	(conformtest-xfail-conds): New variable.
	* conform/data/signal.h-data (uc_sigmask): XFAIL for ia64-linux.
	* conform/data/ucontext.h-data (uc_sigmask): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index ebab4ce0b6f..99ee480b236 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-06-20  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #21634]
+	* sysdeps/unix/sysv/linux/ia64/Makefile [$(subdir) = conform]
+	(conformtest-xfail-conds): New variable.
+	* conform/data/signal.h-data (uc_sigmask): XFAIL for ia64-linux.
+	* conform/data/ucontext.h-data (uc_sigmask): Likewise.
+
 2017-06-20  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	* benchtests/powf-inputs: Add reduced trace from wrf.
diff --git a/conform/data/signal.h-data b/conform/data/signal.h-data
index 571816484fe..08635d2c6b4 100644
--- a/conform/data/signal.h-data
+++ b/conform/data/signal.h-data
@@ -24,7 +24,8 @@ type mcontext_t
 
 type ucontext_t
 element ucontext_t {ucontext_t*} uc_link
-element ucontext_t sigset_t uc_sigmask
+// Bug 21634: uc_sigmask has wrong type.
+xfail[ia64-linux]-element ucontext_t sigset_t uc_sigmask
 element ucontext_t stack_t uc_stack
 element ucontext_t mcontext_t uc_mcontext
 
@@ -135,7 +136,8 @@ constant SIGSTKSZ
 type ucontext_t
 
 element ucontext_t {ucontext_t*} uc_link
-element ucontext_t sigset_t uc_sigmask
+// Bug 21634: uc_sigmask has wrong type.
+xfail[ia64-linux]-element ucontext_t sigset_t uc_sigmask
 element ucontext_t stack_t uc_stack
 element ucontext_t mcontext_t uc_mcontext
 
diff --git a/conform/data/ucontext.h-data b/conform/data/ucontext.h-data
index c1ddf19d94b..7e0b4a7f68b 100644
--- a/conform/data/ucontext.h-data
+++ b/conform/data/ucontext.h-data
@@ -4,7 +4,8 @@ type mcontext_t
 type ucontext_t
 
 element ucontext_t {ucontext_t*} uc_link
-element ucontext_t sigset_t uc_sigmask
+// Bug 21634: uc_sigmask has wrong type.
+xfail[ia64-linux]-element ucontext_t sigset_t uc_sigmask
 element ucontext_t stack_t uc_stack
 element ucontext_t mcontext_t uc_mcontext
 
diff --git a/sysdeps/unix/sysv/linux/ia64/Makefile b/sysdeps/unix/sysv/linux/ia64/Makefile
index 4d6766db5e7..97fc7df0b12 100644
--- a/sysdeps/unix/sysv/linux/ia64/Makefile
+++ b/sysdeps/unix/sysv/linux/ia64/Makefile
@@ -25,3 +25,8 @@ endif
 ifeq ($(subdir),nptl)
 libpthread-sysdep_routines += __ia64_longjmp unwind_longjmp __sigstack_longjmp
 endif
+
+ifeq ($(subdir),conform)
+# For bug 21634.
+conformtest-xfail-conds += ia64-linux
+endif