aboutsummaryrefslogtreecommitdiff
path: root/conform/data
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-06-09 11:39:33 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-06-09 11:39:33 +0000
commit09f19b05525cbe6d1d403af660684f72cb8f080f (patch)
treea9451ad722b2cc23c0c18f030ba202d9b2c2e6a3 /conform/data
parent686554bff63dff0f8b20c84e9bdca45e643f9d9c (diff)
downloadglibc-09f19b05525cbe6d1d403af660684f72cb8f080f.zip
glibc-09f19b05525cbe6d1d403af660684f72cb8f080f.tar.gz
glibc-09f19b05525cbe6d1d403af660684f72cb8f080f.tar.bz2
conformtest: clean up POSIX expectations for termios.h, time.h.
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 termios.h and time.h. Tested x86_64; no new XFAILs needed. * conform/data/termios.h-data [POSIX] (IUCLC): Do not expect constant. [POSIX] (IXANY): Likewise. [POSIX] (OLCUC): Likewise. [POSIX || POSIX2008] (CBAUD): Do not allow. [POSIX || POSIX2008] (DEFECHO): Likewise. [POSIX || POSIX2008] (ECHOCTL): Likewise. [POSIX || POSIX2008] (ECHOKE): Likewise. [POSIX || POSIX2008] (ECHOPRT): Likewise. [POSIX || POSIX2008] (EXTA): Likewise. [POSIX || POSIX2008] (EXTB): Likewise. [POSIX || POSIX2008] (FLUSHO): Likewise. [POSIX || POSIX2008] (LOBLK): Likewise. [POSIX || POSIX2008] (PENDIN): Likewise. [POSIX || POSIX2008] (SWTCH): Likewise. [POSIX || POSIX2008] (VDISCARD): Likewise. [POSIX || POSIX2008] (VDSUSP): Likewise. [POSIX || POSIX2008] (VLNEXT): Likewise. [POSIX || POSIX2008] (VREPRINT): Likewise. [POSIX || POSIX2008] (VSTATUS): Likewise. [POSIX || POSIX2008] (VWERASE): Likewise. (B*): Change to B[0123456789]*. * conform/data/time.h-data [POSIX || UNIX98] (CLOCK_PROCESS_CPUTIME_ID): Do not expect constant. [POSIX || UNIX98] (CLOCK_THREAD_CPUTIME_ID): Likewise. [POSIX || UNIX98] (CLOCK_MONOTONIC): Likewise. [POSIX] (tm_*): Do not allow.
Diffstat (limited to 'conform/data')
-rw-r--r--conform/data/termios.h-data10
-rw-r--r--conform/data/time.h-data6
2 files changed, 13 insertions, 3 deletions
diff --git a/conform/data/termios.h-data b/conform/data/termios.h-data
index 3f7ab4b..de34bf5 100644
--- a/conform/data/termios.h-data
+++ b/conform/data/termios.h-data
@@ -37,16 +37,18 @@ constant IGNPAR
constant INLCR
constant INPCK
constant ISTRIP
-# if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
+# if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
constant IUCLC
# endif
+# ifndef POSIX
constant IXANY
+# endif
constant IXOFF
constant IXON
constant PARMRK
constant OPOST
-# if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
+# if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
constant OLCUC
# endif
# if !defined POSIX && !defined POSIX2008
@@ -148,6 +150,7 @@ function pid_t tcgetsid (int)
function int tcsendbreak (int, int)
function int tcsetattr (int, int, const struct termios*)
+#if !defined POSIX && !defined POSIX2008
allow CBAUD
allow DEFECHO
allow ECHOCTL
@@ -165,12 +168,13 @@ allow VLNEXT
allow VREPRINT
allow VSTATUS
allow VWERASE
+#endif
allow c_*
allow V*
allow I*
allow O*
allow TC*
-allow B*
+allow B[0123456789]*
allow *_t
#endif
diff --git a/conform/data/time.h-data b/conform/data/time.h-data
index fead998..ddd9a07 100644
--- a/conform/data/time.h-data
+++ b/conform/data/time.h-data
@@ -46,8 +46,10 @@ function int timespec_get (struct timespec *, int)
symbol CLK_TCK
# endif
# if !defined XPG3 && !defined XPG4
+# if !defined POSIX && !defined UNIX98
constant CLOCK_PROCESS_CPUTIME_ID
constant CLOCK_THREAD_CPUTIME_ID
+# endif
type {struct itimerspec}
@@ -56,7 +58,9 @@ element {struct itimerspec} {struct timespec} it_value
constant CLOCK_REALTIME
constant TIMER_ABSTIME
+# if !defined POSIX && !defined UNIX98
constant CLOCK_MONOTONIC
+# endif
type clockid_t
type timer_t
@@ -116,7 +120,9 @@ variable {long int} timezone
# endif
variable {char*} tzname [2]
+# ifndef POSIX
allow tm_*
+# endif
allow clock_*
allow timer_*
allow it_*