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.
This commit is contained in:
Joseph Myers 2014-03-06 17:42:03 +00:00
parent 355bc9868b
commit 2ea18461d3
27 changed files with 54 additions and 26 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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