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 <fcntl.h> header shall define the symbolic constants
for file modes for use as values of mode_t as described in
<sys/stat.h>.".  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.

diff --git a/ChangeLog b/ChangeLog
index a7dd3a72ff76aa7d2ae859d154d6603a7c4af706..b85a2938ea194840b02a4cee4754b115d3e5ffe3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2016-05-12  Joseph Myers  <joseph@codesourcery.com>
+
+       * 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.
+
 2016-05-12  Wilco Dijkstra  <wdijkstr@arm.com>
 
        * sysdeps/aarch64/memset.S (__memset):

diff --git a/conform/Makefile b/conform/Makefile
index d93dba042d392c72eff7683ef814315104cf4b08..b5a1ee86b1414610e9ccdd0e79acbdc649ef69a5 100644 (file)
--- 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 1971d4a7422939722ac7f42d4464f545d0d2f4bc..ccaf98f4876a8e4d5a99e6345fbfe18ebd6b2b9f 100644 (file)
--- 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