This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

conformtest: Don't test non-C90 headers for C90


Two headers run conformtest tests for "ISO" (C90) despite not being in
C90: iso646.h (added in C90 Amendment 1, C94/C95; I'll add separate
expectations for that later, but the tests for wchar.h and wctype.h
operate on the basis that ISO mode is pure C90, not Amendment 1) and
stdint.h.

I propose this patch to disable the inappropriate tests for ISO mode,
and the other modes based on C90 that also do not include these
headers (UNIX98 does have iso646.h).  Tested x86_64.

2012-04-28  Joseph Myers  <joseph@codesourcery.com>

	* conform/data/iso646.h-data [ISO || POSIX || XPG3 || XPG4]:
	Disable tests.
	* conform/data/stdint.h-data [ISO || POSIX || XPG3 || XPG4 ||
	UNIX98]: Likewise.

diff --git a/conform/data/iso646.h-data b/conform/data/iso646.h-data
index ffbf489..7ac7d09 100644
--- a/conform/data/iso646.h-data
+++ b/conform/data/iso646.h-data
@@ -1,3 +1,4 @@
+#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4
 macro and
 macro and_eq
 macro bitand
@@ -11,3 +12,4 @@ macro xor
 macro xor_eq
 
 allow *_t
+#endif
diff --git a/conform/data/stdint.h-data b/conform/data/stdint.h-data
index 5b3fb17..99bdf22 100644
--- a/conform/data/stdint.h-data
+++ b/conform/data/stdint.h-data
@@ -1,3 +1,4 @@
+#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 type int8_t
 type int16_t
 type int32_t
@@ -112,3 +113,4 @@ macro UINTMAX_C
 // fnamtch implementation doesn't grok the right form.
 allow INT*
 allow UINT*
+#endif

-- 
Joseph S. Myers
joseph@codesourcery.com


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]