cpp-if1.c: Adjust regexps to accommodate cccp.

1999-04-03 10:35 -0500  Zack Weinberg  <zack@rabi.columbia.edu>
	* gcc.dg/cpp-if1.c: Adjust regexps to accommodate cccp.
	* gcc.dg/cpp-if3.c: Don't use -pedantic.
	* gcc.misc-tests/m-un-2.c: Adjust regexps for new format of
	missing initializer warnings.

From-SVN: r26150

gcc/testsuite/ChangeLog

+1999-04-03 10:35 -0500  Zack Weinberg  <zack@rabi.columbia.edu>
+
+	* gcc.dg/cpp-if1.c: Adjust regexps to accommodate cccp.
+	* gcc.dg/cpp-if3.c: Don't use -pedantic.
+	* gcc.misc-tests/m-un-2.c: Adjust regexps for new format of
+	missing initializer warnings.
+
 Sun Mar 28 00:49:41 1999  Jeffrey A Law  (law@cygnus.com)
 
 	* lib/objc-torture.exp: Replace "77" with "Obj-C" in pattern

gcc/testsuite/gcc.dg/cpp-if1.c

@@ -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 white" "invalid number" } */
 #endif
 
-#if 0abc /* { dg-error "nvalid number" "invalid number" } */
+#if 0abc /* { dg-error "nvalid number|missing white" "invalid number" } */
 #endif
 
-#if 42abc /* { dg-error "nvalid number" "invalid number" } */
+#if 42abc /* { dg-error "nvalid number|missing white" "invalid number" } */
 #endif
 
-#if 1.2 /* { dg-error "floating point numbers" "floating point in #if" } */
+#if 1.2 /* { dg-error "loating point numbers" "floating point in #if" } */
 #endif
 
-#if 4uu /* { dg-error "too many `u' suffixes" "too many suffixes" } */
+#if 4uu /* { dg-error "(too many|two) `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" } */

gcc/testsuite/gcc.dg/cpp-if3.c

+/* Test that the preprocessor is capable of 64-bit arithmetic.
+   (Must turn off -pedantic, since `LL' constants are only in C9x.)  */
 /* { dg-do preprocess } */
-/* { dg-options -pedantic-errors } */
+/* { dg-options "" } */
 
 #define U_MAX 4294967295U
 #define ULL_MAX 18446744073709551615ULL

gcc/testsuite/gcc.misc-tests/m-un-2.c

@@ -15,12 +15,14 @@ struct vtable {
 struct vtable mtable = {
   malloc,
   free
-}; /* { dg-warning "missing initializer for `mtable._realloc'" "warning regression" } */
+}; /* { dg-warning "missing initializer" "warning regression" { target native } {18} } */
+   /* { dg-warning "initialization for `mtable._realloc'" "warning regression" { target native } {18} } */
 
 struct vtable mtable2 = {
   ._malloc = malloc,
   ._realloc = realloc
-}; /* { dg-warning "missing initializer for `mtable2._free'" "warning regression" } */
+}; /* { dg-warning "missing initializer" "warning regression" { target native } {24} } */
+   /* { dg-warning "initialization for `mtable2._free'" "warning regression" { target native } {24} } */
 
 struct vtable mtable3 = {
   ._free = free,