This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
conformtest: clean up POSIX expections for sys/utsname.h, sys/wait.h
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Fri, 16 May 2014 21:34:55 +0000
- Subject: conformtest: clean up POSIX expections for sys/utsname.h, sys/wait.h
- Authentication-results: sourceware.org; auth=none
Continuing the series of patches to clean up conformtest expectations
for "POSIX" (1995/6) based on review of the expectations against the
standard, this patch cleans up expectations for sys/utsname.h and
sys/wait.h. Tested x86_64; a new XFAIL for sys/wait.h is added.
(This patch is independent of my previous patch
<https://sourceware.org/ml/libc-alpha/2014-05/msg00391.html>.)
2014-05-16 Joseph Myers <joseph@codesourcery.com>
* conform/data/sys/utsname.h-data (*_t): Allow.
* conform/data/sys/wait.h-data [POSIX] (uid_t): Do not define.
[POSIX] (WEXITED): Do not expect constant.
[POSIX] (WSTOPPED): Likewise.
[POSIX] (WNOHANG): Likewise.
[POSIX] (WNOWAIT): Likewise.
[POSIX] (siginfo_t): Do not expect type or elements.
[POSIX] (pid_t): Do not expect type.
[POSIX] (signal.h): Do not allow header.
[POSIX] (sys/resource.h): Likewise.
[POSIX] (si_*): Do not allow pattern.
[POSIX] (W*): Likewise.
[POSIX] (P_*): Likewise.
[POSIX] (BUS_*): Likewise.
[POSIX] (CLD_*): Likewise.
[POSIX] (FPE_*): Likewise.
[POSIX] (ILL_*): Likewise.
[POSIX] (POLL_*): Likewise.
[POSIX] (SEGV_*): Likewise.
[POSIX] (SI_*): Likewise.
[POSIX] (TRAP_*): Likewise.
* conform/Makefile (test-xfail-POSIX/sys/wait.h/conform): New
variable.
diff --git a/conform/Makefile b/conform/Makefile
index e1df914..c360c33 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -189,6 +189,7 @@ test-xfail-XPG4/ucontext.h/conform = yes
test-xfail-XPG4/unistd.h/conform = yes
test-xfail-XPG4/utmpx.h/conform = yes
test-xfail-POSIX/tar.h/conform = yes
+test-xfail-POSIX/sys/wait.h/conform = yes
test-xfail-UNIX98/arpa/inet.h/conform = yes
test-xfail-UNIX98/fcntl.h/conform = yes
test-xfail-UNIX98/langinfo.h/conform = yes
diff --git a/conform/data/sys/utsname.h-data b/conform/data/sys/utsname.h-data
index 3564627..82f7f39 100644
--- a/conform/data/sys/utsname.h-data
+++ b/conform/data/sys/utsname.h-data
@@ -8,4 +8,5 @@ element {struct utsname} char version []
element {struct utsname} char machine []
function int uname (struct utsname *)
+allow *_t
#endif
diff --git a/conform/data/sys/wait.h-data b/conform/data/sys/wait.h-data
index 6acdab2..e0787e3 100644
--- a/conform/data/sys/wait.h-data
+++ b/conform/data/sys/wait.h-data
@@ -1,7 +1,6 @@
#if !defined ISO && !defined ISO99 && !defined ISO11
#ifdef POSIX
# define pid_t __pid_t
-# define uid_t __uid_t
#endif
constant WNOHANG
@@ -17,13 +16,15 @@ macro WIFSTOPPED
macro WSTOPSIG
macro WTERMSIG
+# ifndef POSIX
constant WEXITED
constant WSTOPPED
-# if !defined POSIX && !defined POSIX2008
+# ifndef POSIX2008
constant WCONTINUED
-# endif
+# endif
constant WNOHANG
constant WNOWAIT
+# endif
#if !defined POSIX
type idtype_t
@@ -33,7 +34,6 @@ constant P_PID
constant P_PGID
type id_t
-#endif
type siginfo_t
@@ -46,6 +46,7 @@ element siginfo_t {void*} si_addr
element siginfo_t int si_status
element siginfo_t long si_band
element siginfo_t {union sigval} si_value
+#endif
#if !defined POSIX && !defined XPG3 && !defined XOPEN2K8 && !defined POSIX2008
type {struct rusage}
@@ -54,7 +55,9 @@ element {struct rusage} {struct timeval} ru_utime
element {struct rusage} {struct timeval} ru_stime
#endif
+#if !defined POSIX
type pid_t
+#endif
function pid_t wait (int*)
#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
@@ -65,6 +68,7 @@ function int waitid (idtype_t, id_t, siginfo_t*, int)
#endif
function pid_t waitpid (pid_t, int*, int)
+#if !defined POSIX
allow-header signal.h
allow-header sys/resource.h
@@ -79,5 +83,6 @@ allow POLL_
allow SEGV_
allow SI_
allow TRAP_
+#endif
allow *_t
#endif
--
Joseph S. Myers
joseph@codesourcery.com