conformtest: Do not expect strdup in string.h for XPG3.

This patch corrects a spurious conformtest expectation of strdup in
string.h for XPG3.

Tested for x86_64 and x86.

	* conform/data/string.h-data (strdup): Do not expect for [XPG3].
	* conform/Makefile (test-xfail-XPG3/string.h/conform): Remove
	variable.

diff --git a/ChangeLog b/ChangeLog
index 8ccf928b024b5294d6ca5292f70aa58a2b0f3e89..193f1d4ac0a57a5ba0fdc2f386b7e83ca02b5a84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-13  Joseph Myers  <joseph@codesourcery.com>
+
+       * conform/data/string.h-data (strdup): Do not expect for [XPG3].
+       * conform/Makefile (test-xfail-XPG3/string.h/conform): Remove
+       variable.
+
 2016-05-13  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #20072]

diff --git a/conform/Makefile b/conform/Makefile
index b46dc42f06a7b496f94a11dd91a5860a9b5a2873..0d610ad99f42341ebc258fbcd85a8dd6295ac1ca 100644 (file)
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -169,7 +169,6 @@ test-xfail-XPG3/pwd.h/conform = yes
 test-xfail-XPG3/search.h/conform = yes
 test-xfail-XPG3/signal.h/conform = yes
 test-xfail-XPG3/stdlib.h/conform = yes
-test-xfail-XPG3/string.h/conform = yes
 test-xfail-XPG3/sys/wait.h/conform = yes
 test-xfail-XPG4/arpa/inet.h/conform = yes
 test-xfail-XPG4/netdb.h/conform = yes

diff --git a/conform/data/string.h-data b/conform/data/string.h-data
index cc3b1c9732866ce31941d19547c3e53f8495966b..39fa76cd22f6b0e155eab5b3a770bf0e80e9f19d 100644 (file)
--- a/conform/data/string.h-data
+++ b/conform/data/string.h-data
@@ -27,7 +27,7 @@ function int strcoll_l (const char*, const char*, locale_t)
 #endif
 function {char*} strcpy (char*, const char*)
 function size_t strcspn (const char*, const char*)
-#if !defined ISO && !defined ISO99 & !defined ISO11 && !defined POSIX && !defined POSIX2008
+#if !defined ISO && !defined ISO99 & !defined ISO11 && !defined XPG3 && !defined POSIX && !defined POSIX2008
 function {char*} strdup (const char*)
 #endif
 function {char*} strerror (int)