aboutsummaryrefslogtreecommitdiff
path: root/conform
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-05-20 19:45:06 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-05-20 19:45:06 +0000
commitb003c666efc6c25908a36bcabee87a2bf1c49a09 (patch)
treed0531d4d8a29fa393177a34132268c86f617463d /conform
parentb56e416f72faaf3d1ed7016fdb23d4ab580035a0 (diff)
downloadglibc-b003c666efc6c25908a36bcabee87a2bf1c49a09.zip
glibc-b003c666efc6c25908a36bcabee87a2bf1c49a09.tar.gz
glibc-b003c666efc6c25908a36bcabee87a2bf1c49a09.tar.bz2
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.
Diffstat (limited to 'conform')
-rw-r--r--conform/Makefile1
-rw-r--r--conform/data/ftw.h-data9
2 files changed, 9 insertions, 1 deletions
diff --git a/conform/Makefile b/conform/Makefile
index 573fbde..b67e8e9 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/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
diff --git a/conform/data/ftw.h-data b/conform/data/ftw.h-data
index 0fa586a..9102bbe 100644
--- a/conform/data/ftw.h-data
+++ b/conform/data/ftw.h-data
@@ -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