From 6da85a0daf65a407f942622e23fc20b37b80168c Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 1 Jun 2017 17:17:43 +0000 Subject: conformtest: Correct signal.h expectations for XPG4 / XPG42. Various of the signal.h conform/ failures for XPG4 and XPG42 are actually the result of incorrect test expectations rather than header bugs. This patch fixes the expectations to accord with those standards (this does not however allow any XFAILs to be removed, as some header bugs remain). Note for anyone comparing with the standards: corrigendum U013/16 removes the mention of a sigmask function in signal.h (C435 lists such a function in the definition of signal.h, but without any actual specification for the function itself), so sigmask is not included in the expectations. Tested for x86_64. * conform/data/signal.h-data (sa_sigaction): Do not expect for [XPG4]. (SA_SIGINFO): Likewise. (SA_ONSTACK): Likewise. (SA_RESETHAND): Likewise. (SA_RESTART): Likewise. (SA_NOCLDWAIT): Likewise. (SA_NODEFER): Likewise. (SS_ONSTACK): Likewise. (SS_DISABLE): Likewise. (MINSIGSTKSZ): Likewise. (SIGSTKSZ): Likewise. (ucontext_t): Likewise. (stack_t): Likewise. (struct sigstack): Likewise. (SI_USER): Do not expect for [XPG4 || XPG42]. (SI_QUEUE): Likewise. (SI_TIMER): Likewise. (SI_ASYNCIO): Likewise. (SI_MESGQ): Likewise. (bsd_signal): Do not expect for [XPG4]. (killpg): Likewise. (sigaltstack): Likewise. (sighold): Likewise. (sigignore): Likewise. (siginterrupt): Likewise. (sigpause): Likewise. (sigrelse): Likewise. (sigset): Likewise. (sigwait): Do not expect for [XPG4 || XPG42]. --- ChangeLog | 33 +++++++++++++++++++++++++++++++++ conform/data/signal.h-data | 28 +++++++++++++++++----------- 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c54da8a12..961c549653 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +2017-06-01 Joseph Myers + + * conform/data/signal.h-data (sa_sigaction): Do not expect for + [XPG4]. + (SA_SIGINFO): Likewise. + (SA_ONSTACK): Likewise. + (SA_RESETHAND): Likewise. + (SA_RESTART): Likewise. + (SA_NOCLDWAIT): Likewise. + (SA_NODEFER): Likewise. + (SS_ONSTACK): Likewise. + (SS_DISABLE): Likewise. + (MINSIGSTKSZ): Likewise. + (SIGSTKSZ): Likewise. + (ucontext_t): Likewise. + (stack_t): Likewise. + (struct sigstack): Likewise. + (SI_USER): Do not expect for [XPG4 || XPG42]. + (SI_QUEUE): Likewise. + (SI_TIMER): Likewise. + (SI_ASYNCIO): Likewise. + (SI_MESGQ): Likewise. + (bsd_signal): Do not expect for [XPG4]. + (killpg): Likewise. + (sigaltstack): Likewise. + (sighold): Likewise. + (sigignore): Likewise. + (siginterrupt): Likewise. + (sigpause): Likewise. + (sigrelse): Likewise. + (sigset): Likewise. + (sigwait): Do not expect for [XPG4 || XPG42]. + 2017-06-01 Zack Weinberg [BZ #21514] diff --git a/conform/data/signal.h-data b/conform/data/signal.h-data index 8fbe3ac55d..571816484f 100644 --- a/conform/data/signal.h-data +++ b/conform/data/signal.h-data @@ -104,30 +104,34 @@ type {struct sigaction} element {struct sigaction} {void(*} sa_handler )(int) element {struct sigaction} sigset_t sa_mask element {struct sigaction} int sa_flags +# ifndef XPG4 element {struct sigaction} {void(*} sa_sigaction )(int, siginfo_t*, void*) +# endif constant SA_NOCLDSTOP +# ifndef XPG4 constant SA_SIGINFO +# endif constant SIG_BLOCK constant SIG_UNBLOCK constant SIG_SETMASK -# if !defined POSIX && !defined POSIX2008 +# if !defined XPG4 && !defined POSIX && !defined POSIX2008 constant SA_ONSTACK # endif -# if !defined POSIX +# if !defined XPG4 && !defined POSIX constant SA_RESETHAND constant SA_RESTART constant SA_NOCLDWAIT constant SA_NODEFER # endif -# if !defined POSIX && !defined POSIX2008 +# if !defined XPG4 && !defined POSIX && !defined POSIX2008 constant SS_ONSTACK constant SS_DISABLE constant MINSIGSTKSZ constant SIGSTKSZ # endif -# if !defined POSIX +# if !defined XPG4 && !defined POSIX type ucontext_t element ucontext_t {ucontext_t*} uc_link @@ -208,17 +212,19 @@ constant POLL_HUP constant TRAP_BRKPT constant TRAP_TRACE # endif +# if !defined XPG4 && !defined XPG42 constant SI_USER constant SI_QUEUE constant SI_TIMER constant SI_ASYNCIO constant SI_MESGQ +# endif -# if !defined XOPEN2K8 && !defined POSIX && !defined POSIX2008 +# if !defined XPG4 && !defined XOPEN2K8 && !defined POSIX && !defined POSIX2008 function void (*bsd_signal (int, void(*)(int)))(int) # endif function int kill (pid_t, int) -# if !defined POSIX && !defined POSIX2008 +# if !defined XPG4 && !defined POSIX && !defined POSIX2008 function int killpg (pid_t, int) # endif # if !defined XPG4 && !defined XPG42 @@ -227,19 +233,19 @@ function int pthread_sigmask (int, const sigset_t*, sigset_t*) # endif function int sigaction (int, const struct sigaction*, struct sigaction*) function int sigaddset (sigset_t*, int) -# if !defined POSIX && !defined POSIX2008 +# if !defined XPG4 && !defined POSIX && !defined POSIX2008 function int sigaltstack (const stack_t*, stack_t*) # endif function int sigdelset (sigset_t*, int) function int sigemptyset (sigset_t*) function int sigfillset (sigset_t*) -# if !defined POSIX && !defined POSIX2008 +# if !defined XPG4 && !defined POSIX && !defined POSIX2008 function int sighold (int) function int sigignore (int) function int siginterrupt (int, int) # endif function int sigismember (const sigset_t*, int) -#if !defined POSIX && !defined POSIX2008 +#if !defined XPG4 && !defined POSIX && !defined POSIX2008 function int sigpause (int) # endif function int sigpending (sigset_t*) @@ -247,7 +253,7 @@ function int sigprocmask (int, const sigset_t*, sigset_t*) # if !defined XPG4 && !defined XPG42 function int sigqueue (pid_t, int, const union sigval) # endif -# if !defined POSIX && !defined POSIX2008 +# if !defined XPG4 && !defined POSIX && !defined POSIX2008 function int sigrelse (int) function void (*sigset (int, void(*)(int)))(int) # endif @@ -258,8 +264,8 @@ function int sigsuspend (const sigset_t*) # if !defined XPG4 && !defined XPG42 function int sigtimedwait (const sigset_t*, siginfo_t*, const struct timespec*) # endif -function int sigwait (const sigset_t*, int*) # if !defined XPG4 && !defined XPG42 +function int sigwait (const sigset_t*, int*) function int sigwaitinfo (const sigset_t*, siginfo_t*) # endif # if defined XOPEN2K8 || defined POSIX2008 -- cgit 1.4.1