mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 02:03:35 +08:00
conformtest: Correct ftw.h expectations for XPG3, XPG4.
This patch corrects various conformtest expectations in ftw.h for XPG3 and XPG4. Tested for x86_64 and x86. * conform/data/ftw.h-data (struct FTW): Do not expect for [XPG3]. (FTW_DP): Do not expect for [XPG3 || XPG4]. (FTW_SL): Do not expect for [XPG3]. (FTW_SLN): Likewise. (FTW_PHYS): Likewise. (FTW_MOUNT): Likewise. (FTW_DEPTH): Likewise. (FTW_CHDIR): Likewise. (nftw): Likewise. * conform/Makefile (test-xfail-XPG3/ftw.h/conform): Remove variable.
This commit is contained in:
parent
b56e416f72
commit
b003c666ef
14
ChangeLog
14
ChangeLog
@ -1,3 +1,17 @@
|
||||
2016-05-20 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
* conform/data/ftw.h-data (struct FTW): Do not expect for [XPG3].
|
||||
(FTW_DP): Do not expect for [XPG3 || XPG4].
|
||||
(FTW_SL): Do not expect for [XPG3].
|
||||
(FTW_SLN): Likewise.
|
||||
(FTW_PHYS): Likewise.
|
||||
(FTW_MOUNT): Likewise.
|
||||
(FTW_DEPTH): Likewise.
|
||||
(FTW_CHDIR): Likewise.
|
||||
(nftw): Likewise.
|
||||
* conform/Makefile (test-xfail-XPG3/ftw.h/conform): Remove
|
||||
variable.
|
||||
|
||||
2016-05-19 Rical Jasan <ricaljasan@pacific.net>
|
||||
|
||||
* manual/errno.texi: Fix various typos & grammar errors.
|
||||
|
@ -163,7 +163,6 @@ test-xfail-XOPEN2K/ndbm.h/conform = yes
|
||||
test-xfail-XOPEN2K8/ndbm.h/conform = yes
|
||||
|
||||
# Unsorted expected failures.
|
||||
test-xfail-XPG3/ftw.h/conform = yes
|
||||
test-xfail-XPG3/limits.h/conform = yes
|
||||
test-xfail-XPG3/signal.h/conform = yes
|
||||
test-xfail-XPG3/sys/wait.h/conform = yes
|
||||
|
@ -1,13 +1,19 @@
|
||||
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
|
||||
# ifndef XPG3
|
||||
type {struct FTW}
|
||||
element {struct FTW} int base
|
||||
element {struct FTW} int level
|
||||
# endif
|
||||
|
||||
macro FTW_F
|
||||
macro FTW_D
|
||||
macro FTW_DNR
|
||||
# if !defined XPG3 && !defined XPG4
|
||||
macro FTW_DP
|
||||
# endif
|
||||
macro FTW_NS
|
||||
|
||||
# ifndef XPG3
|
||||
macro FTW_SL
|
||||
macro FTW_SLN
|
||||
|
||||
@ -15,9 +21,12 @@ macro FTW_PHYS
|
||||
macro FTW_MOUNT
|
||||
macro FTW_DEPTH
|
||||
macro FTW_CHDIR
|
||||
# endif
|
||||
|
||||
function int ftw (const char*, int (*) (const char *, const struct stat*, int), int)
|
||||
# ifndef XPG3
|
||||
function int nftw (const char*, int (*) (const char *, const struct stat*, int, struct FTW *), int, int)
|
||||
# endif
|
||||
|
||||
allow-header sys/stat.h
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user