From 8142262bc5f14bf83fd67f654298500eed45aeee Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 13 May 2016 16:57:09 +0000 Subject: 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. --- ChangeLog | 6 ++++++ conform/Makefile | 1 - conform/data/string.h-data | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ccf928b02..193f1d4ac0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-05-13 Joseph Myers + + * 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 [BZ #20072] diff --git a/conform/Makefile b/conform/Makefile index b46dc42f06..0d610ad99f 100644 --- 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 cc3b1c9732..39fa76cd22 100644 --- 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) -- cgit 1.4.1