From ca927ec4c23f47b559e8e2d493caaad9c13092f6 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 12 May 2016 16:46:55 +0000 Subject: conformtest: Do not expect S_IF* in fcntl.h. The conform/ tests for fcntl.h are failing for XPG3 and XPG4 because of missing S_IFSOCK. This is a case of a bogus test. The relevant wording requiring such constants is, in current POSIX (and this requirement dates back as far as XPG4), "The header shall define the symbolic constants for file modes for use as values of mode_t as described in .". Note that this is *file modes* not *file types*. That makes sense, since the point is presumably for use with functions such as open that are declared in fcntl.h, where file modes are relevant but file types aren't. So this patch removes all those spurious S_IF* expectations for fcntl.h (the macros are generally still *allowed* through the permission to make everything from sys/stat.h visible). Tested for x86_64 and x86. * conform/data/fcntl.h-data [!POSIX] (S_IFMT): Do not expect. [!POSIX] (S_IFBLK): Likewise. [!POSIX] (S_IFCHR): Likewise. [!POSIX] (S_IFIFO): Likewise. [!POSIX] (S_IFREG): Likewise. [!POSIX] (S_IFDIR): Likewise. [!POSIX] (S_IFLNK): Likewise. [!POSIX] (S_IFSOCK): Likewise. * conform/Makefile (test-xfail-XPG3/fcntl.h/conform): Remove variable. (test-xfail-XPG4/fcntl.h/conform): Likewise. --- conform/Makefile | 2 -- conform/data/fcntl.h-data | 9 --------- 2 files changed, 11 deletions(-) (limited to 'conform') diff --git a/conform/Makefile b/conform/Makefile index d93dba042d..b5a1ee86b1 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -163,7 +163,6 @@ test-xfail-XOPEN2K/ndbm.h/conform = yes test-xfail-XOPEN2K8/ndbm.h/conform = yes # Unsorted expected failures. -test-xfail-XPG3/fcntl.h/conform = yes test-xfail-XPG3/ftw.h/conform = yes test-xfail-XPG3/limits.h/conform = yes test-xfail-XPG3/pwd.h/conform = yes @@ -175,7 +174,6 @@ test-xfail-XPG3/sys/wait.h/conform = yes test-xfail-XPG3/time.h/conform = yes test-xfail-XPG3/unistd.h/conform = yes test-xfail-XPG4/arpa/inet.h/conform = yes -test-xfail-XPG4/fcntl.h/conform = yes test-xfail-XPG4/netdb.h/conform = yes test-xfail-XPG4/netinet/in.h/conform = yes test-xfail-XPG4/signal.h/conform = yes diff --git a/conform/data/fcntl.h-data b/conform/data/fcntl.h-data index 1971d4a742..ccaf98f487 100644 --- a/conform/data/fcntl.h-data +++ b/conform/data/fcntl.h-data @@ -48,15 +48,6 @@ constant O_RDWR constant O_WRONLY #if !defined POSIX -constant S_IFMT -constant S_IFBLK -constant S_IFCHR -constant S_IFIFO -constant S_IFREG -constant S_IFDIR -constant S_IFLNK -constant S_IFSOCK - constant S_IRWXU constant S_IRUSR constant S_IWUSR -- cgit v1.2.3