AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 16:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

conformtest: clean up POSIX expections for sys/utsname.h, sys/wait.h.

Browse Source 
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.

	* 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.
This commit is contained in:
Joseph Myers 2014-10-14 17:00:11 +00:00
parent fda389c8f0
commit a75d3b0288
4 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeLog
View File

@ -1,3 +1,29 @@
2014-10-14 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.
2014-10-14 Paul Pluzhnikov <ppluzhnikov@google.com>
[BZ #12926]

1
conform/Makefile
View File

@ -188,6 +188,7 @@ test-xfail-XPG4/termios.h/conform = yes
test-xfail-XPG4/ucontext.h/conform = yes
test-xfail-XPG4/unistd.h/conform = yes
test-xfail-XPG4/utmpx.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

1
conform/data/sys/utsname.h-data
View File

@ -8,4 +8,5 @@ element {struct utsname} char version []
element {struct utsname} char machine []
function int uname (struct utsname *)
allow *_t
#endif

13
conform/data/sys/wait.h-data
View File

@ -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