OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

conformtest: Fix st_blksize, st_blocks expectations for XPG3, XPG4. 

The conformtest expectations expect the struct stat fields st_blksize
and st_blocks to be of types blksize_t and blkcnt_t.  But XPG4 does
not have those types, using long instead, and XPG3 does not have these
fields at all.  This patch adjusts the expectations for those
standards, XFAILing them for XPG4 to allow for systems where the
typedefs don't correspond to long.

Tested for x86_64 and x86.

	* conform/data/sys/stat.h-data (st_blksize): Do not expect for
	[XPG3].  Expect type long and XFAIL for [XPG4].
	(st_blocks): Likewise.
This commit is contained in:
Joseph Myers 2016-05-10 15:20:09 +00:00
parent 46c1ffa4d5
commit 77d21a1f4f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2016-05-10 Joseph Myers <joseph@codesourcery.com>
* conform/data/sys/stat.h-data (st_blksize): Do not expect for
[XPG3]. Expect type long and XFAIL for [XPG4].
(st_blocks): Likewise.
[BZ #20044]
* posix/unistd.h [__USE_UNIX98 && !__USE_XOPEN2K]
(pthread_atfork): New prototype.

10
conform/data/sys/stat.h-data
View File

@ -44,9 +44,17 @@ element {struct stat} {struct timespec} st_atim
element {struct stat} {struct timespec} st_mtim
element {struct stat} {struct timespec} st_ctim
#endif
#if !defined POSIX && !defined POSIX2008
#if !defined XPG3 && !defined POSIX && !defined POSIX2008
# ifdef XPG4
// The XPG4 use of "long" for these fields is not compatible with the
// use of typedefs in future standards to support values outside the
// range of "long".
xfail-element {struct stat} long st_blksize
xfail-element {struct stat} long st_blocks
# else
element {struct stat} blksize_t st_blksize
element {struct stat} blkcnt_t st_blocks
# endif
#endif
# if defined XOPEN2K8 || defined POSIX2008