conformtest: Fix miscellaneous expectations for XPG4.

This commit is contained in:
Joseph Myers 2012-11-19 22:19:11 +00:00
parent ee663277dc
commit 5ba924e3c7
7 changed files with 72 additions and 9 deletions

View File

@ -1,5 +1,44 @@
2012-11-19 Joseph Myers <joseph@codesourcery.com>
* conform/data/fcntl.h-data [XPG3 || XPG4] (O_DSYNC): Do not
expect.
[XPG3 || XPG4] (O_RSYNC): Likewise.
* conform/data/signal.h-data [XPG3 || XPG4] (pthread_kill):
Likewise.
[XPG3 || XPG4] (pthread_sigmask): Likewise.
[XPG3 || XPG4] (sigqueue): Likewise.
[XPG3 || XPG4] (sigtimedwait): Likewise.
[XPG3 || XPG4] (sigwaitinfo): Likewise.
* conform/data/stdio.h-data [XPG3 || XPG4] (snprintf): Likewise.
[XPG3 || XPG4] (vsnprintf): Likewise.
* conform/data/sys/stat.h-data [XPG3 || XPG4] (blkcnt_t):
Likewise.
[XPG3 || XPG4] (blksize_t): Likewise.
* conform/data/time.h-data [XPG3 || XPG4] (struct timespec):
Likewise.
[XPG3 || XPG4] (CLOCK_PROCESS_CPUTIME_ID): Likewise.
[XPG3 || XPG4] (CLOCK_THREAD_CPUTIME_ID): Likewise.
[XPG3 || XPG4] (struct itimerspec): Likewise.
[XPG3 || XPG4] (CLOCK_REALTIME): Likewise.
[XPG3 || XPG4] (TIMER_ABSTIME): Likewise.
[XPG3 || XPG4] (CLOCK_MONOTONIC): Likewise.
[XPG3 || XPG4] (clockid_t): Likewise.
[XPG3 || XPG4] (timer_t): Likewise.
[XPG3 || XPG4] (clock_getres): Likewise.
[XPG3 || XPG4] (clock_gettime): Likewise.
[XPG3 || XPG4] (clock_settime): Likewise.
[XPG3 || XPG4] (nanosleep): Likewise.
[XPG3 || XPG4] (timer_create): Likewise.
[XPG3 || XPG4] (timer_delete): Likewise.
[XPG3 || XPG4] (timer_gettime): Likewise.
[XPG3 || XPG4] (timer_getoverrun): Likewise.
[XPG3 || XPG4] (timer_settime): Likewise.
* conform/data/unistd.h-data [XPG3 || XPG4] (fdatasync): Likewise.
[XPG3 || XPG4] (getlogin_r): Likewise.
[XPG3 || XPG4] (pread): Likewise.
[XPG3 || XPG4] (pthread_atfork): Likewise.
[XPG3 || XPG4] (pwrite): Likewise.
[BZ #14835]
* signal/signal.h [__USE_XOPEN_EXTENDED]: Include
<bits/siginfo.h>.

View File

@ -30,10 +30,12 @@ constant O_NOCTTY
constant O_TRUNC
constant O_APPEND
constant O_DSYNC
constant O_NONBLOCK
constant O_RSYNC
constant O_SYNC
#if !defined XPG3 && !defined XPG4
constant O_DSYNC
constant O_RSYNC
#endif
constant O_ACCMODE

View File

@ -203,8 +203,10 @@ function int kill (pid_t, int)
# if !defined POSIX && !defined POSIX2008
function int killpg (pid_t, int)
# endif
# if !defined XPG3 && !defined XPG4
function int pthread_kill (pthread_t, int)
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
@ -224,7 +226,9 @@ function int sigpause (int)
# endif
function int sigpending (sigset_t*)
function int sigprocmask (int, const sigset_t*, sigset_t*)
# if !defined XPG3 && !defined XPG4
function int sigqueue (pid_t, int, const union sigval)
# endif
# if !defined POSIX && !defined POSIX2008
function int sigrelse (int)
function void (*sigset (int, void(*)(int)))(int)
@ -233,9 +237,13 @@ function void (*sigset (int, void(*)(int)))(int)
function int sigstack (struct sigstack*, struct sigstack*)
# endif
function int sigsuspend (const sigset_t*)
# if !defined XPG3 && !defined XPG4
function int sigtimedwait (const sigset_t*, siginfo_t*, const struct timespec*)
# endif
function int sigwait (const sigset_t*, int*)
# if !defined XPG3 && !defined XPG4
function int sigwaitinfo (const sigset_t*, siginfo_t*)
# endif
# if defined XOPEN2K8 || defined POSIX2008
function void psiginfo (const siginfo_t*, const char*)
function void psignal (int, const char*)

View File

@ -144,7 +144,7 @@ function void rewind (FILE*)
function int scanf (const char*, ...)
function void setbuf (FILE*, char*)
function int setvbuf (FILE*, char*, int, size_t)
#if !defined ISO && !defined POSIX
#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4
function int snprintf (char*, size_t, const char*, ...)
#endif
function int sprintf (char *, const char *, ...)
@ -166,7 +166,7 @@ function int vprintf (const char*, va_list)
#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
function int vscanf (const char*, va_list)
#endif
#if !defined ISO && !defined POSIX
#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4
function int vsnprintf (char*, size_t, const char*, va_list)
#endif
function int vsprintf (char*, const char*, va_list)

View File

@ -1,6 +1,6 @@
#if !defined ISO && !defined ISO99 && !defined ISO11
#if !defined POSIX && !defined POSIX2008
#if !defined POSIX && !defined POSIX2008 && !defined XPG3 && !defined XPG4
type blkcnt_t
type blksize_t
#endif

View File

@ -5,7 +5,7 @@ macro CLOCKS_PER_SEC {clock_t}
macro-int-constant TIME_UTC > 0
#endif
#if !defined ISO && !defined ISO99
#if !defined ISO && !defined ISO99 && !defined XPG3 && !defined XPG4
type {struct timespec}
element {struct timespec} time_t tv_sec
@ -45,6 +45,7 @@ function int timespec_get (struct timespec *, int)
# if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
symbol CLK_TCK
# endif
# if !defined XPG3 && !defined XPG4
constant CLOCK_PROCESS_CPUTIME_ID
constant CLOCK_THREAD_CPUTIME_ID
@ -59,6 +60,7 @@ constant CLOCK_MONOTONIC
type clockid_t
type timer_t
# endif
# if defined XOPEN2K8 || defined POSIX2008
type pid_t
@ -74,30 +76,38 @@ function {char*} asctime_r (const struct tm*, char*)
#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
function int clock_getcpuclockid (pid_t, clockid_t*)
#endif
#if !defined XPG3 && !defined XPG4
function int clock_getres (clockid_t, struct timespec*)
function int clock_gettime (clockid_t, struct timespec*)
#endif
#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
function int clock_nanosleep (clockid_t, int, const struct timespec*, struct timespec*)
#endif
#if !defined XPG3 && !defined XPG4
function int clock_settime (clockid_t, const struct timespec*)
#endif
function {char*} ctime_r (const time_t*, char*)
# if !defined POSIX && !defined POSIX2008
function {struct tm*} getdate (const char*)
# endif
function {struct tm*} gmtime_r (const time_t*, struct tm*)
function {struct tm*} localtime_r (const time_t*, struct tm*)
# if !defined XPG3 && !defined XPG4
function int nanosleep (const struct timespec*, struct timespec*)
# endif
# if defined XOPEN2K8 || defined POSIX2008
function size_t strftime_l (char*, size_t, const char*, const struct tm*, locale_t)
# endif
# if !defined POSIX && !defined POSIX2008
function {char*} strptime (const char*, const char*, struct tm*)
# endif
# if !defined XPG3 && !defined XPG4
function int timer_create (clockid_t, struct sigevent*, timer_t*)
function int timer_delete (timer_t)
function int timer_gettime (timer_t, struct itimerspec*)
function int timer_getoverrun (timer_t)
function int timer_settime (timer_t, int, const struct itimerspec*, struct itimerspec*)
# endif
function void tzset (void)
# if !defined POSIX && !defined POSIX2008

View File

@ -392,7 +392,9 @@ function int fchownat (int, const char*, uid_t, gid_t, int)
#ifndef POSIX
function int fchdir (int)
#endif
#if !defined XPG3 && !defined XPG4
function int fdatasync (int)
#endif
# if defined XOPEN2K8 || defined POSIX2008
function int fexecve (int, char *const[], char *const[])
# endif
@ -415,7 +417,9 @@ function long gethostid (void)
function int gethostname (char*, size_t)
#endif
function {char*} getlogin (void)
#if !defined XPG3 && !defined XPG4
function int getlogin_r (char*, size_t)
#endif
function int getopt (int, char*const[], const char*)
#if defined XPG3 || defined XPG4 || defined UNIX98
function int getpagesize (void)
@ -452,13 +456,13 @@ function int nice (int)
function {long int} pathconf (const char*, int)
function int pause (void)
function int pipe (int[2])
#ifndef POSIX
#if !defined POSIX && !defined XPG3 && !defined XPG4
function ssize_t pread (int, void*, size_t, off_t)
#endif
#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 && !defined XPG3 && !defined XPG4
function int pthread_atfork (void(*)(void), void(*)(void), void(*)(void))
#endif
#ifndef POSIX
#if !defined POSIX && !defined XPG3 && !defined XPG4
function ssize_t pwrite (int, const void*, size_t, off_t)
#endif
function ssize_t read (int, void*, size_t)