From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 19 May 2016 14:48:30 +0000 (+0000)
Subject: conformtest: Correct pwd.h expectations for XPG3.
X-Git-Tag: glibc-2.24~240
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb37c73778ccc029d20b08d8a5df116c222ca825;p=thirdparty%2Fglibc.git

conformtest: Correct pwd.h expectations for XPG3.

This patch corrects some conformtest expectations for pwd.h for XPG4.

Tested for x86_64 and x86.

	* conform/data/pwd.h-data (endpwent): Do not expect for [XPG3].
	(getpwent): Likewise.
	(setpwent): Likewise.
	* conform/Makefile (test-xfail-XPG3/pwd.h/conform): Remove
	variable.
---

diff --git a/ChangeLog b/ChangeLog
index f5a1dc80636..5bc942eb9fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-05-19  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/data/pwd.h-data (endpwent): Do not expect for [XPG3].
+	(getpwent): Likewise.
+	(setpwent): Likewise.
+	* conform/Makefile (test-xfail-XPG3/pwd.h/conform): Remove
+	variable.
+
 	* conform/data/search.h-data (insque): Do not expect for [XPG3].
 	(remque): Likewise.
 	* conform/Makefile (test-xfail-XPG3/search.h/conform): Remove
diff --git a/conform/Makefile b/conform/Makefile
index eb64e0e8025..573fbdec9f3 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -165,7 +165,6 @@ 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/pwd.h/conform = yes
 test-xfail-XPG3/signal.h/conform = yes
 test-xfail-XPG3/sys/wait.h/conform = yes
 test-xfail-XPG4/arpa/inet.h/conform = yes
diff --git a/conform/data/pwd.h-data b/conform/data/pwd.h-data
index 64d617fdcf4..2c4a6fe733e 100644
--- a/conform/data/pwd.h-data
+++ b/conform/data/pwd.h-data
@@ -23,7 +23,7 @@ function {struct passwd*} getpwnam (const char*)
 function {struct passwd*} getpwuid (uid_t)
 function int getpwnam_r (const char*, struct passwd*, char*, size_t, struct passwd**)
 function int getpwuid_r (uid_t, struct passwd*, char*, size_t, struct passwd**)
-# if !defined POSIX && !defined POSIX2008
+# if !defined XPG3 && !defined POSIX && !defined POSIX2008
 function void endpwent (void)
 function {struct passwd*} getpwent (void)
 function void setpwent (void)