* gcc.dg/cpp/ucs.c: Improved long UCS test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51815 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7c85f78..470ab8e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-03  Richard Henderson  <rth@redhat.com>
+
+       * gcc.dg/cpp/ucs.c: Improved long UCS test.
+
 2002-04-03  Hans-Peter Nilsson  <hp@bitrange.com>
 
        * gcc.dg/wchar_t-1.c, gcc.dg/wchar_t-1.c: Fix typo last change.

diff --git a/gcc/testsuite/gcc.dg/cpp/ucs.c b/gcc/testsuite/gcc.dg/cpp/ucs.c
index d306789..1dfe444 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/ucs.c
+++ b/gcc/testsuite/gcc.dg/cpp/ucs.c
@@ -5,13 +5,43 @@
 
 /* This tests universal character sequences.
 
-   Neil Booth, 22 May 2001.  */
+   Neil Booth, 22 May 2001.
+   Richard Henderson, 3 Apr 2002.  */
+
+#include <limits.h>
+
+#define unsigned        +0
+#define int             +0 
+#define char            +1
+#define short           +2 
+#define long            +3
+
+#if __WCHAR_TYPE__ == 0
+# define WCHAR_MAX      INT_MAX
+#elif __WCHAR_TYPE__ == 1
+# define WCHAR_MAX      CHAR_MAX
+#elif __WCHAR_TYPE__ == 2
+# define WCHAR_MAX      SHRT_MAX
+#elif __WCHAR_TYPE__ == 3
+# define WCHAR_MAX      LONG_MAX
+#else
+# error wacky wchar_t
+#endif
+
+#undef unsigned
+#undef int
+#undef char
+#undef short
+#undef long
 
 #if L'\u1234' != 0x1234
 #error bad short ucs   /* { dg-bogus "bad" "bad \u1234 evaluation" } */
 #endif
-#if L'\U1234abcd' != 0x1234abcd
-#error bad long ucs    /* { dg-bogus "bad" "bad \U1234abcd evaluation" } */
+
+#if WCHAR_MAX >= 0x7ffffff
+# if L'\U1234abcd' != 0x1234abcd
+#  error bad long ucs  /* { dg-bogus "bad" "bad \U1234abcd evaluation" } */
+# endif
 #endif
 
 void foo ()
@@ -24,7 +54,7 @@ void foo ()
   c = L'\u000x';       /* { dg-error "non-hex" "non-hex digit in UCN" } */
   /* If sizeof(HOST_WIDE_INT) > sizeof(wchar_t), we can get a multi-character
      constant warning even for wide characters.  */
-  /* { dg-warning "too long|multi-character" "" { target *-*-* } 24 } */
+  /* { dg-warning "too long|multi-character" "" { target *-*-* } 54 } */
 
   c = '\u0024';                /* { dg-bogus "invalid" "0024 is a valid UCN" } */
   c = "\u0040"[0];     /* { dg-bogus "invalid" "0040 is a valid UCN" } */