Testsuite bugs

[Andreas Schwab]

This fixes the tests gcc.dg/cpp-if1.c and gcc.dg/cpp-if3.c so that they
don't spuriously fail.


1999-03-14  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* gcc.dg/cpp-if3.c: Catch error message about malformed constants.

	* gcc.dg/cpp-if1.c: Fix regexps to match reality.

--- egcs-2.93/gcc/testsuite/gcc.dg/cpp-if1.c.~1~	Tue Mar  9 17:26:13 1999
+++ egcs-2.93/gcc/testsuite/gcc.dg/cpp-if1.c	Sun Mar 14 18:51:46 1999
@@ -9,22 +9,22 @@
 #error 077 != 63 /* { dg-bogus "#error" "normal conversion" } */
 #endif
 
-#if 12wrt /* { dg-error "nvalid number" "invalid number" } */
+#if 12wrt /* { dg-error "nvalid number|missing whitespace" "invalid number" } */
 #endif
 
-#if 0abc /* { dg-error "nvalid number" "invalid number" } */
+#if 0abc /* { dg-error "nvalid number|missing whitespace" "invalid number" } */
 #endif
 
-#if 42abc /* { dg-error "nvalid number" "invalid number" } */
+#if 42abc /* { dg-error "nvalid number|missing whitespace" "invalid number" } */
 #endif
 
-#if 1.2 /* { dg-error "floating point numbers" "floating point in #if" } */
+#if 1.2 /* { dg-error "[fF]loating point number" "floating point in #if" } */
 #endif
 
-#if 4uu /* { dg-error "too many `u' suffixes" "too many suffixes" } */
+#if 4uu /* { dg-error "too (many |)`u'" "too many suffixes" } */
 #endif
 
-#if 124123231lll /* { dg-error "too many `l' suffixes" "too many suffixes" } */
+#if 124123231lll /* { dg-error "too many `l'" "too many suffixes" } */
 #endif
 
 #if 099 /* { dg-error "digits beyond the radix" "decimal in octal constant" } */
--- egcs-2.93/gcc/testsuite/gcc.dg/cpp-if3.c.~1~	Mon Mar  1 20:45:46 1999
+++ egcs-2.93/gcc/testsuite/gcc.dg/cpp-if3.c	Sun Mar 14 18:53:30 1999
@@ -7,17 +7,17 @@
 #define LL_MIN (-LL_MAX-1)
 
 /* Check simple truncation. */
-#if U_MAX == ULL_MAX || LL_MIN == 0 || LL_MAX == -1
+#if U_MAX == ULL_MAX || LL_MIN == 0 || LL_MAX == -1 /* { dg-error "too many `l'" "too many suffixes" } */
 #error "simple truncation"  /* { dg-bogus "trunc" "simple truncation" } */
 #endif
 
 /* Check left/right shifting with all bits set and with one bit set. */
 #if !(~0ULL >> 63) || !(~0ULL << 63) || !(~0LL >> 63) || !(~0LL << 63) || \
-  !(LL_MIN >> 63) || !(1LL << 62) || !(ULL_MAX >> 63) || !(1ULL << 63)
+  !(LL_MIN >> 63) || !(1LL << 62) || !(ULL_MAX >> 63) || !(1ULL << 63) /* { dg-error "too many `l'" "too many suffixes" } */
 #error "bit shift truncation" /* { dg-bogus "trunc" "bit shift truncation" } */
 #endif
 
 /* Check math expressions. */
-#if (2ULL * U_MAX < U_MAX) || (1ULL + U_MAX < U_MAX)
+#if (2ULL * U_MAX < U_MAX) || (1ULL + U_MAX < U_MAX) /* { dg-error "too many `l'" "too many suffixes" } */
 #error "math truncation"  /* { dg-bogus "trunc" "math truncation" } */
 #endif

-- 
Andreas Schwab                                      "And now for something
schwab@issan.cs.uni-dortmund.de                      completely different"
schwab@gnu.org