conformtest: correct set of standards for which some headers are tested.

Reviewing the sets of headers for which conformtest has expectations
for various standards showed up cases where headers had expectations
for standards not including those headers, or were missing
expectations for a standard that did include the header.  This patch
fixes easy cases of this (largely disabling tests for standards for
which they are inapplicable).  Tested x86_64.

	* conform/data/aio.h-data [XPG3 || XPG4]: Disable whole file.
	* conform/data/arpa/inet.h-data [XPG3]: Likewise.
	* conform/data/dlfcn.h-data [XPG3 || XPG4]: Likewise.
	* conform/data/fmtmsg.h-data [XPG3]: Likewise.
	* conform/data/libgen.h-data [XPG3]: Likewise.
	* conform/data/mqueue.h-data [XPG3 || XPG4]: Likewise.
	* conform/data/ndbm.h-data [XPG3]: Likewise.
	* conform/data/net/if.h-data [XPG3 || XPG4 || UNIX98]: Likewise.
	* conform/data/netdb.h-data [XPG3]: Likewise.
	* conform/data/netinet/in.h-data [XPG3]: Likewise.
	* conform/data/poll.h-data [XPG3]: Likewise.
	* conform/data/spawn.h-data [XPG3 || XPG4 || UNIX98]: Likewise.
	* conform/data/strings.h-data [XPG3]: Likewise.
	* conform/data/stropts.h-data [XPG3]: Likewise.
	* conform/data/sys/mman.h-data [XPG3]: Likewise.
	* conform/data/sys/resource.h-data [XPG3]: Likewise.
	* conform/data/sys/select.h-data [XPG3 || XPG4 || UNIX98]:
	Likewise.
	* conform/data/sys/statvfs.h-data [XPG3]: Likewise.
	* conform/data/sys/time.h-data [XPG3]: Likewise.
	* conform/data/sys/timeb.h-data [XPG3]: Likewise.
	* conform/data/sys/uio.h-data [XPG3]: Likewise.
	* conform/data/sys/un.h-data [XPG3]: Likewise.
	* conform/data/syslog.h-data [XPG3]: Likewise.
	* conform/data/ucontext.h-data [XPG3]: Likewise.
	* conform/data/utmpx.h-data [XPG3]: Likewise.
	* conform/data/varargs.h-data [UNIX98]: Enable file.

diff --git a/ChangeLog b/ChangeLog
index 05bed06e44a453c18736f551be951b698aa50558..ce0e9a367f044809021f8dcfdf6f357c49de77be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,33 @@
 2014-03-06  Joseph Myers  <joseph@codesourcery.com>
 
+       * conform/data/aio.h-data [XPG3 || XPG4]: Disable whole file.
+       * conform/data/arpa/inet.h-data [XPG3]: Likewise.
+       * conform/data/dlfcn.h-data [XPG3 || XPG4]: Likewise.
+       * conform/data/fmtmsg.h-data [XPG3]: Likewise.
+       * conform/data/libgen.h-data [XPG3]: Likewise.
+       * conform/data/mqueue.h-data [XPG3 || XPG4]: Likewise.
+       * conform/data/ndbm.h-data [XPG3]: Likewise.
+       * conform/data/net/if.h-data [XPG3 || XPG4 || UNIX98]: Likewise.
+       * conform/data/netdb.h-data [XPG3]: Likewise.
+       * conform/data/netinet/in.h-data [XPG3]: Likewise.
+       * conform/data/poll.h-data [XPG3]: Likewise.
+       * conform/data/spawn.h-data [XPG3 || XPG4 || UNIX98]: Likewise.
+       * conform/data/strings.h-data [XPG3]: Likewise.
+       * conform/data/stropts.h-data [XPG3]: Likewise.
+       * conform/data/sys/mman.h-data [XPG3]: Likewise.
+       * conform/data/sys/resource.h-data [XPG3]: Likewise.
+       * conform/data/sys/select.h-data [XPG3 || XPG4 || UNIX98]:
+       Likewise.
+       * conform/data/sys/statvfs.h-data [XPG3]: Likewise.
+       * conform/data/sys/time.h-data [XPG3]: Likewise.
+       * conform/data/sys/timeb.h-data [XPG3]: Likewise.
+       * conform/data/sys/uio.h-data [XPG3]: Likewise.
+       * conform/data/sys/un.h-data [XPG3]: Likewise.
+       * conform/data/syslog.h-data [XPG3]: Likewise.
+       * conform/data/ucontext.h-data [XPG3]: Likewise.
+       * conform/data/utmpx.h-data [XPG3]: Likewise.
+       * conform/data/varargs.h-data [UNIX98]: Enable file.
+
        * manual/Makefile (INSTALL_INFO): Remove variable setting.
 
        * math/libm-test.inc (struct test_f_f_data): Move expected results

diff --git a/conform/data/aio.h-data b/conform/data/aio.h-data
index d6d0acbbe6c1a883653cdb2556db9f068f4f8302..e87923ed70f863d6d13af7bcc413f37004743b3d 100644 (file)
--- a/conform/data/aio.h-data
+++ b/conform/data/aio.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined XPG4
 type {struct aiocb}
 
 // Test elements of the AIO control struct.

diff --git a/conform/data/arpa/inet.h-data b/conform/data/arpa/inet.h-data
index becee2fd1ee140a0ac77e16c135eed612feed934..2bd3aeea0a15cc43736f41a4ac155657c9a84589 100644 (file)
--- a/conform/data/arpa/inet.h-data
+++ b/conform/data/arpa/inet.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
 // in_port_t should have exactly 16 bits
 type in_port_t
 // in_addr_t should have exactly 32 bits

diff --git a/conform/data/dlfcn.h-data b/conform/data/dlfcn.h-data
index 59dd028911cf435cdd985827e1f0caef17a8c563..a954c9db4642ca4eb89695cc4f1c8fe4bae6a272 100644 (file)
--- a/conform/data/dlfcn.h-data
+++ b/conform/data/dlfcn.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4
 macro RTLD_LAZY
 macro RTLD_NOW
 macro RTLD_GLOBAL

diff --git a/conform/data/fmtmsg.h-data b/conform/data/fmtmsg.h-data
index b6ddf277213cff2489d959c3e707c2f2b7729417..e64d87ce40a96e4ee25f97ec3a5afa9a0cca2a7e 100644 (file)
--- a/conform/data/fmtmsg.h-data
+++ b/conform/data/fmtmsg.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3
 macro MM_HARD
 constant MM_HARD
 

diff --git a/conform/data/libgen.h-data b/conform/data/libgen.h-data
index f59bbb0007636e8226f0a5c398c498ab94c6f20f..443cd0bd227702338368b6c69b14a33368b7ebe2 100644 (file)
--- a/conform/data/libgen.h-data
+++ b/conform/data/libgen.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3
 function {char*} basename (char*)
 function {char*} dirname (char*)
 

diff --git a/conform/data/mqueue.h-data b/conform/data/mqueue.h-data
index 2ff27480e6a93d439512f3b9a70bf1ebe3c43753..76652ce661b18d48425d54687865fe95178ba91a 100644 (file)
--- a/conform/data/mqueue.h-data
+++ b/conform/data/mqueue.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined XPG4
 // should test for not an array type.
 type mqd_t
 

diff --git a/conform/data/ndbm.h-data b/conform/data/ndbm.h-data
index 5d1fc6a3c11589a2ac7161bb81d07b42876951ee..43c6a38d79a1e89ecdfc797c79c0554867cad059 100644 (file)
--- a/conform/data/ndbm.h-data
+++ b/conform/data/ndbm.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3
 type datum
 element datum {void*} dptr
 element datum size_t dsize

diff --git a/conform/data/net/if.h-data b/conform/data/net/if.h-data
index 2c3eb4d9d5960d7409432417ef51b8d41468d105..fd8509567fcf11308316435e375db7a62f2f4bca 100644 (file)
--- a/conform/data/net/if.h-data
+++ b/conform/data/net/if.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 type {struct if_nameindex}
 
 element {struct if_nameindex} {unsigned int} if_index

diff --git a/conform/data/netdb.h-data b/conform/data/netdb.h-data
index a73004c615be6271b2732af76d8aef43b23b4612..c5fd25756dd57caee6b7291e74106854b1a8b1be 100644 (file)
--- a/conform/data/netdb.h-data
+++ b/conform/data/netdb.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
 optional-type in_port_t
 optional-type in_addr_t
 

diff --git a/conform/data/netinet/in.h-data b/conform/data/netinet/in.h-data
index be0236b4909356401cb505e5bebba0a31ba2faa1..928432651b6ec925094c260e91358f946b643cc5 100644 (file)
--- a/conform/data/netinet/in.h-data
+++ b/conform/data/netinet/in.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
 type in_port_t
 type in_addr_t
 

diff --git a/conform/data/poll.h-data b/conform/data/poll.h-data
index 395e4b5011b3e2b7d44a1d1cd9bf50a6c7a3d54a..84777dffa109f487941c773ccd2b3e1928c6a627 100644 (file)
--- a/conform/data/poll.h-data
+++ b/conform/data/poll.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
 type {struct pollfd}
 element {struct pollfd} int fd
 element {struct pollfd} {short int} events

diff --git a/conform/data/spawn.h-data b/conform/data/spawn.h-data
index 637f2bf0d08de9552900abfdea2a58947b323452..fb206f7ecf4a742f6f74fd8fc8f2411853448279 100644 (file)
--- a/conform/data/spawn.h-data
+++ b/conform/data/spawn.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 type posix_spawnattr_t
 type posix_spawn_file_actions_t
 # if defined XOPEN2K8 || defined POSIX2008

diff --git a/conform/data/strings.h-data b/conform/data/strings.h-data
index b61ac50e6ffbc2bebc3f1b848e20a28c83cc361f..d22609a0f8d39e6769407a40d3f52eb3843b6669 100644 (file)
--- a/conform/data/strings.h-data
+++ b/conform/data/strings.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
 # if !defined XOPEN2K8 && !defined POSIX2008
 function int bcmp (const void*, const void*, size_t)
 function void bcopy (const void*, void*, size_t)

diff --git a/conform/data/stropts.h-data b/conform/data/stropts.h-data
index d978a1c5e911e893b26a655ced139edfa4140bde..6849fecc879b22a451d36d139daee7d790c02712 100644 (file)
--- a/conform/data/stropts.h-data
+++ b/conform/data/stropts.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
 type {struct bandinfo}
 
 element {struct bandinfo} {unsigned char} bi_pri

diff --git a/conform/data/sys/mman.h-data b/conform/data/sys/mman.h-data
index 62f8f4b32d67c16488382c45a42ea3e13d3d519a..0555fd17718b5cc9990eb4cf5f171613028cad09 100644 (file)
--- a/conform/data/sys/mman.h-data
+++ b/conform/data/sys/mman.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3
 constant PROT_READ
 constant PROT_WRITE
 constant PROT_EXEC

diff --git a/conform/data/sys/resource.h-data b/conform/data/sys/resource.h-data
index 67517adeda9c2a5d2fb69d3ba933546edd051f4f..5c46dea3019c022fcc552151793c301286626d7f 100644 (file)
--- a/conform/data/sys/resource.h-data
+++ b/conform/data/sys/resource.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3
 constant PRIO_PROCESS
 constant PRIO_PGRP
 constant PRIO_USER

diff --git a/conform/data/sys/select.h-data b/conform/data/sys/select.h-data
index 84e07e97298e3226d061fd0c7bb3d30e4d31001a..00f037ac5cbce686a91177a4286be0038cca9a23 100644 (file)
--- a/conform/data/sys/select.h-data
+++ b/conform/data/sys/select.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 type time_t
 type suseconds_t
 

diff --git a/conform/data/sys/statvfs.h-data b/conform/data/sys/statvfs.h-data
index 750f22b4e1e6fffc134a0abeda64eef8f53d5913..fa56fbeee1416be42b84e337968e58dec1676d40 100644 (file)
--- a/conform/data/sys/statvfs.h-data
+++ b/conform/data/sys/statvfs.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
 type {struct statvfs}
 
 element {struct statvfs} {unsigned long} f_bsize

diff --git a/conform/data/sys/time.h-data b/conform/data/sys/time.h-data
index 98e590989c8cbaffef2842b800a8711606a259b0..1d07bd638015d2efd0a355079d7ca04b5119ec69 100644 (file)
--- a/conform/data/sys/time.h-data
+++ b/conform/data/sys/time.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3
 type {struct timeval}
 
 element {struct timeval} time_t tv_sec

diff --git a/conform/data/sys/timeb.h-data b/conform/data/sys/timeb.h-data
index 460da6ee8c8dda43b0fda8e48386f16f6449460d..dbae045bd5aa967aef102bbe5f040159d80a886e 100644 (file)
--- a/conform/data/sys/timeb.h-data
+++ b/conform/data/sys/timeb.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
 type {struct timeb}
 
 element {struct timeb} time_t time

diff --git a/conform/data/sys/uio.h-data b/conform/data/sys/uio.h-data
index 3352695104b635b30db0de8463f814d74f812301..da606b8f3f5c0bc3b834c45f96459f4e8c0407a8 100644 (file)
--- a/conform/data/sys/uio.h-data
+++ b/conform/data/sys/uio.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
 type {struct iovec}
 
 element {struct iovec} {void*} iov_base

diff --git a/conform/data/sys/un.h-data b/conform/data/sys/un.h-data
index ee157ed5f85e86b38fedcd7f9f3c888808902ca4..3bf7968683a754f832071cebb512053cd7b2201f 100644 (file)
--- a/conform/data/sys/un.h-data
+++ b/conform/data/sys/un.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
 type {struct sockaddr_un}
 
 element {struct sockaddr_un} sa_family_t sun_family

diff --git a/conform/data/syslog.h-data b/conform/data/syslog.h-data
index 26fef76ac12e1ab9236b2087fc02fb2993e9761b..05619cf48989e8877b8b178e24e2cc08d2a006c2 100644 (file)
--- a/conform/data/syslog.h-data
+++ b/conform/data/syslog.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3
 constant LOG_PID
 constant LOG_CONS
 constant LOG_NDELAY

diff --git a/conform/data/ucontext.h-data b/conform/data/ucontext.h-data
index 2b5f3b4a6f1b5a173c5d44321e35920afa1b30ed..93e9c1ed5129c5894d793b539ca189f252d820e7 100644 (file)
--- a/conform/data/ucontext.h-data
+++ b/conform/data/ucontext.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
 type mcontext_t
 
 type ucontext_t

diff --git a/conform/data/utmpx.h-data b/conform/data/utmpx.h-data
index b9dd0d5a59b020e67ee927f9b1200f5f156cfae0..b8a0062321614acea4b0809a7f7e0e417b9b0e61 100644 (file)
--- a/conform/data/utmpx.h-data
+++ b/conform/data/utmpx.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3
 type {struct utmpx}
 
 element {struct utmpx} char ut_user []

diff --git a/conform/data/varargs.h-data b/conform/data/varargs.h-data
index a486b7260330bd6022e28932edf54b5b335bef32..48435fe38750a391b4e608c2ce3b41e7c74e0d4f 100644 (file)
--- a/conform/data/varargs.h-data
+++ b/conform/data/varargs.h-data
@@ -1,4 +1,4 @@
-#if defined XPG3 || defined XPG4
+#if defined XPG3 || defined XPG4 || defined UNIX98
 macro va_alist
 macro va_dcl
 type va_list