mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 02:03:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

conformtest: Correct some stdlib.h expectations for XPG3.

Browse Source 
This patch corrects some spurious conformtest stdlib.h expectations
for XPG3 (not based on a full review of the expectations for that
standard, so other issues may remain).

Tested for x86_64 and x86.

	* conform/data/stdlib.h-data (a64l): Do not expect for [XPG3].
	(ecvt): Likewise.
	(fcvt): Likewise.
	(gcvt): Likewise.
	(getsubopt): Likewise.
	(grantpt): Likewise.
	(initstate): Likewise.
	(l64a): Likewise.
	(mktemp): Likewise.
	(mkstemp): Likewise.
	(ptsname): Likewise.
	(random): Likewise.
	(realpath): Likewise.
	(setstate): Likewise.
	(srandom): Likewise.
	(ttyslot): Likewise.
	(unlockpt): Likewise.
	(valloc): Likewise.
This commit is contained in:
Joseph Myers 2016-05-13 17:26:04 +00:00
parent 8142262bc5
commit fdbdbc83a5
2 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -1,5 +1,24 @@
2016-05-13 Joseph Myers <joseph@codesourcery.com> 2016-05-13 Joseph Myers <joseph@codesourcery.com>
* conform/data/stdlib.h-data (a64l): Do not expect for [XPG3].
(ecvt): Likewise.
(fcvt): Likewise.
(gcvt): Likewise.
(getsubopt): Likewise.
(grantpt): Likewise.
(initstate): Likewise.
(l64a): Likewise.
(mktemp): Likewise.
(mkstemp): Likewise.
(ptsname): Likewise.
(random): Likewise.
(realpath): Likewise.
(setstate): Likewise.
(srandom): Likewise.
(ttyslot): Likewise.
(unlockpt): Likewise.
(valloc): Likewise.
* conform/data/string.h-data (strdup): Do not expect for [XPG3]. * conform/data/string.h-data (strdup): Do not expect for [XPG3].
* conform/Makefile (test-xfail-XPG3/string.h/conform): Remove * conform/Makefile (test-xfail-XPG3/string.h/conform): Remove
variable. variable.

40
conform/data/stdlib.h-data
View File

@ -35,7 +35,7 @@ macro WTERMSIG
#if !defined ISO && !defined XPG3 && !defined XPG4 && !defined UNIX98 && !defined POSIX #if !defined ISO && !defined XPG3 && !defined XPG4 && !defined UNIX98 && !defined POSIX
function void _Exit (int) function void _Exit (int)
#endif #endif
#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 long a64l (const char*) function long a64l (const char*)
#endif #endif
function void abort (void) function void abort (void)
@ -59,28 +59,32 @@ function div_t div (int, int)
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
function double drand48 (void) function double drand48 (void)
#endif #endif
#if defined XPG3 || defined XPG4 || defined UNIX98 || defined XOPEN2K #if defined XPG4 || defined UNIX98 || defined XOPEN2K
function {char*} ecvt (double, int, int*, int*) function {char*} ecvt (double, int, int*, int*)
#endif #endif
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
function double erand48 (unsigned short int[3]) function double erand48 (unsigned short int[3])
#endif #endif
function void exit (int) function void exit (int)
#if defined XPG3 || defined XPG4 || defined UNIX98 || defined XOPEN2K #if defined XPG4 || defined UNIX98 || defined XOPEN2K
function {char*} fcvt (double, int, int*, int*) function {char*} fcvt (double, int, int*, int*)
#endif #endif
function void free (void*) function void free (void*)
#if defined XPG3 || defined XPG4 || defined UNIX98 || defined XOPEN2K #if defined XPG4 || defined UNIX98 || defined XOPEN2K
function {char*} gcvt (double, int, char*) function {char*} gcvt (double, int, char*)
#endif #endif
function {char*} getenv (const char*) function {char*} getenv (const char*)
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX
function int getsubopt (char**, char *const*, char**) function int getsubopt (char**, char *const*, char**)
#endif #endif
#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 int grantpt (int) function int grantpt (int)
function {char*} initstate (unsigned int, char*, size_t) function {char*} initstate (unsigned int, char*, size_t)
#endif
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
function {long int} jrand48 (unsigned short int[3]) function {long int} jrand48 (unsigned short int[3])
#endif
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined POSIX2008
function {char*} l64a (long) function {char*} l64a (long)
#endif #endif
function {long int} labs (long int) function {long int} labs (long int)
@ -102,10 +106,10 @@ function int mbtowc (wchar_t*, const char*, size_t)
#if defined XOPEN2K8 || defined POSIX2008 #if defined XOPEN2K8 || defined POSIX2008
function {char*} mkdtemp (char*) function {char*} mkdtemp (char*)
#endif #endif
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XOPEN2K8 && !defined POSIX2008 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined XOPEN2K8 && !defined POSIX2008
function {char*} mktemp (char*) function {char*} mktemp (char*)
#endif #endif
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX
function int mkstemp (char*) function int mkstemp (char*)
#endif #endif
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
@ -118,8 +122,10 @@ function int posix_memalign (void**, size_t, size_t)
#if defined XOPEN2K || defined XOPEN2K8 #if defined XOPEN2K || defined XOPEN2K8
function int posix_openpt (int) function int posix_openpt (int)
#endif #endif
#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*} ptsname (int) function {char*} ptsname (int)
#endif
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
function int putenv (char*) function int putenv (char*)
#endif #endif
function void qsort (void*, size_t, size_t, int(*)(const void*, const void*)) function void qsort (void*, size_t, size_t, int(*)(const void*, const void*))
@ -130,12 +136,14 @@ function int rand (void)
#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 #if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008
function int rand_r (unsigned int*) function int rand_r (unsigned int*)
#endif #endif
#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 long random (void) function long random (void)
#endif #endif
function {void*} realloc (void*, size_t) function {void*} realloc (void*, size_t)
#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*} realpath (const char*, char*) function {char*} realpath (const char*, char*)
#endif
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
function {unsigned short int*} seed48 (unsigned short int[3]) function {unsigned short int*} seed48 (unsigned short int[3])
#endif #endif
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
@ -143,11 +151,15 @@ function int setenv (const char*, const char*, int)
#endif #endif
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
function void setkey (const char*) function void setkey (const char*)
#endif
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined POSIX2008
function {char*} setstate (char*) function {char*} setstate (char*)
#endif #endif
function void srand (unsigned int) function void srand (unsigned int)
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
function void srand48 (long int) function void srand48 (long int)
#endif
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined POSIX && !defined POSIX2008
function void srandom (unsigned) function void srandom (unsigned)
#endif #endif
function double strtod (const char*, char**) function double strtod (const char*, char**)
@ -162,16 +174,16 @@ function {long long int} strtoll (const char*, char**, int)
function {unsigned long long int} strtoull (const char*, char**, int) function {unsigned long long int} strtoull (const char*, char**, int)
#endif #endif
function int system (const char*) function int system (const char*)
#if defined XPG3 || defined XPG4 || defined UNIX98 #if defined XPG4 || defined UNIX98
function int ttyslot (void) function int ttyslot (void)
#endif #endif
#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 int unlockpt (int) function int unlockpt (int)
#endif #endif
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
function int unsetenv (const char*) function int unsetenv (const char*)
#endif #endif
#if defined XPG3 || defined XPG4 || defined UNIX98 #if defined XPG4 || defined UNIX98
function {void*} valloc (size_t) function {void*} valloc (size_t)
#endif #endif
function size_t wcstombs (char*, const wchar_t*, size_t) function size_t wcstombs (char*, const wchar_t*, size_t)